Merge from Chromium at DEPS revision 37.0.2062.76

This commit was generated by merge_to_master.py.

Change-Id: I167d28401e65e520fca24a7cd89b56027205c775

android_webview/buildbot/aosp_manifest.xml

@@ -261,7 +261,7 @@
   <project name="platform/frameworks/support" path="frameworks/support" revision="1e3d0c89282627f8b0d66d2bdae4efc2287ab043"/>
   <project name="platform/frameworks/testing" path="frameworks/testing" revision="5c8e0271db889518f5969b142a37faa01a4ee54d"/>
   <project name="platform/frameworks/volley" path="frameworks/volley" revision="a53cb80bea6fc83edfa73e7a850e83f4020fcf07"/>
-  <project name="platform/frameworks/webview" path="frameworks/webview" revision="2b4719f12bac2f9f71d99567f09f46916903edf8"/>
+  <project name="platform/frameworks/webview" path="frameworks/webview" revision="707d93ceba55f52771e749b223fbfc010c9a025e"/>
   <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="a62c3572e60ae0446632de15418a65089cccf551"/>
   <project name="platform/hardware/akm" path="hardware/akm" revision="32838ef838d1341aa8b77022869b801fb0bbb26c"/>
   <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="55ddd0cce019e88829f92b2fe4e17d5869daa9b9"/>

android_webview/public/browser/draw_gl.h

@@ -86,8 +86,11 @@ typedef void* AwGetNativeBufferFunction(long buffer_id);
 // Called to get the stride of the buffer
 typedef unsigned int AwGetStrideFunction(long buffer_id);
 
+static const int kAwDrawGLFunctionTableVersion = 1;
+
 // Set of functions used in rendering in hardware mode
 struct AwDrawGLFunctionTable {
+  int version;
   AwCreateGraphicBufferFunction* create_graphic_buffer;
   AwReleaseGraphicBufferFunction* release_graphic_buffer;
   AwMapFunction* map;

android_webview/public/browser/draw_sw.h

@@ -43,9 +43,12 @@ typedef void (SkiaVersionFunction)(int* major, int* minor, int* patch);
 // Called to verify if the Skia versions are compatible.
 typedef bool (AwIsSkiaVersionCompatibleFunction)(SkiaVersionFunction function);
 
+static const int kAwDrawSWFunctionTableVersion = 1;
+
 // "vtable" for the functions declared in this file. An instance must be set via
 // AwContents.setAwDrawSWFunctionTable
 struct AwDrawSWFunctionTable {
+  int version;
   AwAccessPixelsFunction* access_pixels;
   AwReleasePixelsFunction* release_pixels;
 };

ash/strings/ash_strings_am.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046">ወደ <ph name="DISPLAY_NAME"/> በማንጸባረቅ ላይ</translation>
 <translation id="2727977024730340865">አነስተኛ ኃይል ወዳለው ባትሪ መሙያ ተሰክቷል። የባትሪ መሙላት አስተማማኝ ላይሆን ይችላል።</translation>
 <translation id="3784455785234192852">ቆልፍ</translation>
-<translation id="2805756323405976993">ትግበራዎች </translation>
+<translation id="2805756323405976993">መተግበሪያዎች</translation>
 <translation id="1512064327686280138">የማግበር አለመሳካት</translation>
 <translation id="5097002363526479830">ከአውታረ መረብ «<ph name="NAME"/>» ጋር መገናኘት አልተሳካም፦ <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi ጠፍቷል።</translation>

ash/strings/ash_strings_da.xtb

@@ -177,7 +177,7 @@ Tryk på Shift+Alt for at ændre den.</translation>
 <translation id="5045550434625856497">Ugyldig adgangskode</translation>
 <translation id="1602076796624386989">Aktivér mobildata</translation>
 <translation id="68610848741840742">ChromeVox (talefeedback)</translation>
-<translation id="6981982820502123353">Hjælpemidler</translation>
+<translation id="6981982820502123353">Hjælpefunktioner</translation>
 <translation id="6585808820553845416">Sessionen slutter om <ph name="SESSION_TIME_REMAINING"/>.</translation>
 <translation id="4274292172790327596">Fejlen genkendes ikke</translation>
 <translation id="5977415296283489383">Hovedtelefon</translation>
@@ -194,7 +194,7 @@ Servermeddelelse: <ph name="SERVER_MSG"/></translation>
 <translation id="9044646465488564462">Det var ikke muligt at oprette forbindelse til netværket: <ph name="DETAILS"/></translation>
 <translation id="7029814467594812963">Afslut session</translation>
 <translation id="8454013096329229812">Wi-Fi er slået til.</translation>
-<translation id="4872237917498892622">Alt+Søg eller Skift</translation>
+<translation id="4872237917498892622">Alt+Søg eller Shift</translation>
 <translation id="2429753432712299108">Bluetooth-enheden &quot;<ph name="DEVICE_NAME"/>&quot; vil gerne have parringstilladelse. Inden du accepterer, skal du bekræfte, at denne adgangsnøgle er vist på den pågældende enhed: <ph name="PASSKEY"/></translation>
 <translation id="9201131092683066720">Batteriet er <ph name="PERCENTAGE"/> % opladet.</translation>
 <translation id="2983818520079887040">Indstillinger...</translation>
@@ -218,10 +218,10 @@ Servermeddelelse: <ph name="SERVER_MSG"/></translation>
 <translation id="4895488851634969361">Batteriet er helt opladet.</translation>
 <translation id="615957422585914272">Vis skærmtastatur</translation>
 <translation id="5947494881799873997">Fortryd</translation>
-<translation id="7593891976182323525">Søg eller skift</translation>
+<translation id="7593891976182323525">Søg eller Shift</translation>
 <translation id="7649070708921625228">Hjælp</translation>
 <translation id="3050422059534974565">CAPS LOCK er slået til.
-Tryk på Søg eller Skift for at annullere.</translation>
+Tryk på Søg eller Shift for at annullere.</translation>
 <translation id="397105322502079400">Beregner...</translation>
 <translation id="158849752021629804">Hjemmenetværk mangler</translation>
 <translation id="1013923882670373915">Bluetooth-enheden &quot;<ph name="DEVICE_NAME"/>&quot; vil gerne have parringstilladelse. Indtast denne pinkode på den pågældende enhed: <ph name="PINCODE"/></translation>
@@ -242,7 +242,7 @@ Tryk på Søg eller Skift for at annullere.</translation>
 Tryk på Ctrl+Alt+Z for at deaktivere dette.</translation>
 <translation id="5045002648206642691">Google Drev-indstillinger...</translation>
 <translation id="7209101170223508707">CAPS LOCK er slået til.
-Tryk på Alt+Søg eller Skift for at annullere.</translation>
+Tryk på Alt+Søg eller Shift for at annullere.</translation>
 <translation id="8940956008527784070">Batteriniveauet er lavt (<ph name="PERCENTAGE"/> %)</translation>
 <translation id="4918086044614829423">Accepter</translation>
 <translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> tilbage</translation>

ash/strings/ash_strings_es-419.xtb

@@ -154,7 +154,7 @@ Para cambiarlo, presiona Shift + Alt.</translation>
 <translation id="1882897271359938046">Copiando en <ph name="DISPLAY_NAME"/></translation>
 <translation id="2727977024730340865">Conexión a un cargador de baja potencia. Es posible que la carga de la batería no sea confiable.</translation>
 <translation id="3784455785234192852">Bloquear</translation>
-<translation id="2805756323405976993">Google Apps</translation>
+<translation id="2805756323405976993">Aplicaciones</translation>
 <translation id="1512064327686280138">Fallo en la activación</translation>
 <translation id="5097002363526479830">Error al conectar a la red &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi desactivada</translation>

ash/strings/ash_strings_hi.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046"><ph name="DISPLAY_NAME"/> पर मिरर कर रहा है</translation>
 <translation id="2727977024730340865">कम-शक्ति वाले चार्जर में प्लग इन करें. बैटरी चार्ज करना संभवत: विश्वसनीय नहीं होगा.</translation>
 <translation id="3784455785234192852">लॉक करें</translation>
-<translation id="2805756323405976993">Apps</translation>
+<translation id="2805756323405976993">ऐप्स</translation>
 <translation id="1512064327686280138">सक्रियण विफलता</translation>
 <translation id="5097002363526479830">नेटवर्क से कनेक्ट करने में विफल '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">वाई-फ़ाई  बंद है.</translation>

ash/strings/ash_strings_hu.xtb

@@ -154,7 +154,7 @@ A váltáshoz nyomja meg a Shift + Alt billentyűkódot.</translation>
 <translation id="1882897271359938046">Tükrözés: <ph name="DISPLAY_NAME"/></translation>
 <translation id="2727977024730340865">Kis teljesítményű töltőt csatlakoztatott. Az akkumulátor töltése nem megbízható.</translation>
 <translation id="3784455785234192852">Zárolás</translation>
-<translation id="2805756323405976993">Google Alkalmazások</translation>
+<translation id="2805756323405976993">Alkalmazások</translation>
 <translation id="1512064327686280138">Aktiválási hiba</translation>
 <translation id="5097002363526479830">Nem sikerült csatlakozni a(z) <ph name="NAME"/> hálózathoz: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi kikapcsolva.</translation>

ash/strings/ash_strings_ja.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046"><ph name="DISPLAY_NAME"/> へミラーリング</translation>
 <translation id="2727977024730340865">低電力の充電器に接続しています。バッテリーが充電されない可能性があります。</translation>
 <translation id="3784455785234192852">ロック</translation>
-<translation id="2805756323405976993">Apps</translation>
+<translation id="2805756323405976993">アプリ</translation>
 <translation id="1512064327686280138">起動失敗</translation>
 <translation id="5097002363526479830">ネットワーク「<ph name="NAME"/>」に接続できませんでした: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi が無効になりました。</translation>

ash/strings/ash_strings_ml.xtb

@@ -153,7 +153,7 @@
 <translation id="1882897271359938046"><ph name="DISPLAY_NAME"/> എന്നതിലേക്ക് മിറർചെയ്യുന്നു</translation>
 <translation id="2727977024730340865">കുറഞ്ഞ തോതിൽ വൈദ്യുതി പ്രവഹിക്കുന്ന ചാർജ്ജറിലേക്ക് പ്ലഗ് ചെയ്‌തിരിക്കുന്നു. ബാറ്ററി ചാർജുചെയ്യൽ വിശ്വസനീയമാകണമെന്നില്ല.</translation>
 <translation id="3784455785234192852">ലോക്കുചെയ്യുക</translation>
-<translation id="2805756323405976993">അപ്ലിക്കേഷന്‍സ്</translation>
+<translation id="2805756323405976993">ആപ്സ്</translation>
 <translation id="1512064327686280138">സജീവമാക്കല്‍ പരാജയപ്പെട്ടു</translation>
 <translation id="5097002363526479830">'<ph name="NAME"/>' നെറ്റ്‌വര്‍‌ക്കിലേക്ക് ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi ഓഫുചെയ്‌തു.</translation>

ash/strings/ash_strings_sr.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046">Пресликавање у <ph name="DISPLAY_NAME"/></translation>
 <translation id="2727977024730340865">Уређај је укључен у пуњач мале снаге. Пуњење батерије можда неће бити поуздано.</translation>
 <translation id="3784455785234192852">Закључај</translation>
-<translation id="2805756323405976993">Apps</translation>
+<translation id="2805756323405976993">Апликације</translation>
 <translation id="1512064327686280138">Активација није успела</translation>
 <translation id="5097002363526479830">Повезивање са мрежом „<ph name="NAME"/>“ није успело: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi је искључен.</translation>

ash/strings/ash_strings_sv.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046">Spegling av <ph name="DISPLAY_NAME"/></translation>
 <translation id="2727977024730340865">Ansluten till en laddare med låg effekt. Batteriet kanske inte laddas ordentligt.</translation>
 <translation id="3784455785234192852">Lås</translation>
-<translation id="2805756323405976993">Apps</translation>
+<translation id="2805756323405976993">Appar</translation>
 <translation id="1512064327686280138">Aktiveringsfel</translation>
 <translation id="5097002363526479830">Det gick inte att ansluta till nätverket <ph name="NAME"/>: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi är inaktiverat.</translation>

ash/strings/ash_strings_te.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046"><ph name="DISPLAY_NAME"/>కు దర్పణం చేస్తోంది</translation>
 <translation id="2727977024730340865">తక్కువ-పవర్ గల ఛార్జర్‌కు ప్లగిన్ చేయబడింది. బ్యాటరీ ఛార్జింగ్ విశ్వసనీయంగా ఉండకపోవచ్చు.</translation>
 <translation id="3784455785234192852">లాక్ చేయి</translation>
-<translation id="2805756323405976993">Apps</translation>
+<translation id="2805756323405976993">యాప్స్</translation>
 <translation id="1512064327686280138">సక్రియా విఫలం</translation>
 <translation id="5097002363526479830">'<ph name="NAME"/>'కు నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి విఫలమైంది: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">Wi-Fi నిలిపివేయబడింది.</translation>

ash/strings/ash_strings_th.xtb

@@ -154,7 +154,7 @@
 <translation id="1882897271359938046">กำลังแสดงผลไปที่ <ph name="DISPLAY_NAME"/></translation>
 <translation id="2727977024730340865">เสียบอยู่กับที่ชาร์จพลังงานต่ำ การชาร์จแบตเตอรี่อาจไม่น่าเชื่อถือ</translation>
 <translation id="3784455785234192852">ล็อก</translation>
-<translation id="2805756323405976993">แอปพลิเคชัน</translation>
+<translation id="2805756323405976993">แอป</translation>
 <translation id="1512064327686280138">การเปิดใช้งานล้มเหลว</translation>
 <translation id="5097002363526479830">ไม่สามารถเชื่อมต่อเครือข่าย &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
 <translation id="1850504506766569011">WiFi ปิดอยู่</translation>

ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

@@ -4,6 +4,7 @@
 
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
@@ -20,42 +21,11 @@
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
-namespace {
-
-class VirtualKeyboardButton : public views::ImageButton {
- public:
-  VirtualKeyboardButton(views::ButtonListener* listener);
-  virtual ~VirtualKeyboardButton();
-
-  // Overridden from views::ImageButton:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardButton);
-};
-
-VirtualKeyboardButton::VirtualKeyboardButton(views::ButtonListener* listener)
-    : views::ImageButton(listener) {
-}
-
-VirtualKeyboardButton::~VirtualKeyboardButton() {
-}
-
-gfx::Size VirtualKeyboardButton::GetPreferredSize() const {
-  const int virtual_keyboard_button_height = kShelfSize;
-  gfx::Size size = ImageButton::GetPreferredSize();
-  int padding = virtual_keyboard_button_height - size.height();
-  size.set_height(virtual_keyboard_button_height);
-  size.set_width(size.width() + padding);
-  return size;
-}
-
-}  // namespace
 
 VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget),
       button_(NULL) {
-  button_ = new VirtualKeyboardButton(this);
+  button_ = new views::ImageButton(this);
   button_->SetImage(views::CustomButton::STATE_NORMAL,
                     ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                         IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD));
@@ -82,6 +52,30 @@ VirtualKeyboardTray::~VirtualKeyboardTray() {
 void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
+
+  // Pad button size to align with other controls in the system tray.
+  const gfx::ImageSkia image = button_->GetImage(
+      views::CustomButton::STATE_NORMAL);
+  int top_padding = (kTrayBarButtonWidth - image.height()) / 2;
+  int left_padding = (kTrayBarButtonWidth - image.width()) / 2;
+  int bottom_padding = kTrayBarButtonWidth - image.height() - top_padding;
+  int right_padding = kTrayBarButtonWidth - image.width() - left_padding;
+
+  // Square up the padding if horizontally aligned. Avoid extra padding when
+  // vertically aligned as the button would violate the width constraint on the
+  // shelf.
+  if (alignment == SHELF_ALIGNMENT_BOTTOM || alignment == SHELF_ALIGNMENT_TOP) {
+    gfx::Insets insets = button_->GetInsets();
+    int additional_padding = std::max(0, top_padding - left_padding);
+    left_padding += additional_padding;
+    right_padding += additional_padding;
+  }
+
+  button_->SetBorder(views::Border::CreateEmptyBorder(
+      top_padding,
+      left_padding,
+      bottom_padding,
+      right_padding));
 }
 
 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() {

ash/wm/lock_state_controller.cc

@@ -16,6 +16,7 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/strings/string_util.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer_animation_sequence.h"
@@ -584,8 +585,17 @@ void LockStateController::LockAnimationCancelled() {
 }
 
 void LockStateController::PreLockAnimationFinished(bool request_lock) {
-  can_cancel_lock_animation_ = false;
   VLOG(1) << "PreLockAnimationFinished";
+  can_cancel_lock_animation_ = false;
+
+  // Don't do anything (including starting the lock-fail timer) if the screen
+  // was already locked while the animation was going.
+  if (system_is_locked_) {
+    DCHECK(!request_lock) << "Got request to lock already-locked system "
+                          << "at completion of pre-lock animation";
+    return;
+  }
+
   if (request_lock) {
     Shell::GetInstance()->metrics()->RecordUserMetricsAction(
         shutdown_after_lock_ ?
@@ -594,24 +604,19 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
     delegate_->RequestLockScreen();
   }
 
-  int lock_timeout = kLockFailTimeoutMs;
-
+  base::TimeDelta timeout =
+      base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs);
 #if defined(OS_CHROMEOS)
-  std::string board = base::SysInfo::GetLsbReleaseBoard();
-
   // Increase lock timeout for slower hardware, see http://crbug.com/350628
+  const std::string board = base::SysInfo::GetLsbReleaseBoard();
   if (board == "x86-mario" ||
-      board.substr(0, 8) == "x86-alex" ||
-      board.substr(0, 7) == "x86-zgb") {
-    lock_timeout *= 2;
+      StartsWithASCII(board, "x86-alex", true /* case_sensitive */) ||
+      StartsWithASCII(board, "x86-zgb", true /* case_sensitive */)) {
+    timeout *= 2;
   }
 #endif
-
   lock_fail_timer_.Start(
-      FROM_HERE,
-      base::TimeDelta::FromMilliseconds(lock_timeout),
-      this,
-      &LockStateController::OnLockFailTimeout);
+      FROM_HERE, timeout, this, &LockStateController::OnLockFailTimeout);
 }
 
 void LockStateController::PostLockAnimationFinished() {

ash/wm/maximize_mode/maximize_mode_controller.cc

@@ -192,6 +192,11 @@ bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const {
   return maximize_mode_window_manager_.get() != NULL;
 }
 
+void MaximizeModeController::AddWindow(aura::Window* window) {
+  if (IsMaximizeModeWindowManagerEnabled())
+    maximize_mode_window_manager_->AddWindow(window);
+}
+
 void MaximizeModeController::Shutdown() {
   maximize_mode_window_manager_.reset();
   Shell::GetInstance()->OnMaximizeModeEnded();

ash/wm/maximize_mode/maximize_mode_controller.h

@@ -26,6 +26,9 @@ class MaximizeModeControllerTest;
 class MaximizeModeEventBlocker;
 class MaximizeModeWindowManager;
 class MaximizeModeWindowManagerTest;
+namespace test {
+class MultiUserWindowManagerChromeOSTest;
+}
 
 // MaximizeModeController listens to accelerometer events and automatically
 // enters and exits maximize mode when the lid is opened beyond the triggering
@@ -82,6 +85,12 @@ class ASH_EXPORT MaximizeModeController : public AccelerometerObserver,
   // Test if the MaximizeModeWindowManager is enabled or not.
   bool IsMaximizeModeWindowManagerEnabled() const;
 
+  // Add a special window to the MaximizeModeWindowManager for tracking. This is
+  // only required for special windows which are handled by other window
+  // managers like the |MultiUserWindowManager|.
+  // If the maximize mode is not enabled no action will be performed.
+  void AddWindow(aura::Window* window);
+
   // TODO(jonross): move this into the destructor. Currently separated as
   // ShellOberver notifies of maximize mode ending, and the observers end up
   // attempting to access MaximizeModeController via the Shell. If done in
@@ -108,6 +117,7 @@ class ASH_EXPORT MaximizeModeController : public AccelerometerObserver,
  private:
   friend class MaximizeModeControllerTest;
   friend class MaximizeModeWindowManagerTest;
+  friend class test::MultiUserWindowManagerChromeOSTest;
 
   // Detect hinge rotation from |base| and |lid| accelerometers and
   // automatically start / stop maximize mode.