Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e

4 files changed, 20 insertions, 4 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 373bd1b9eb..42217a0821 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -91,7 +91,12 @@ const char kAshDisableSoftwareMirroring[] = "ash-disable-software-mirroring";
 // Disable the notification when a low-power USB charger is connected.
 const char kAshDisableUsbChargerNotification[] =
     "ash-disable-usb-charger-notification";
-#endif
+
+// TODO(jamescook): Remove this unused flag. It exists only to allow the
+// "Enable audio device menu" about:flags item to have the tri-state
+// default/enabled/disabled UI.
+const char kAshEnableAudioDeviceMenu[] = "ash-enable-audio-device-menu";
+#endif  // defined(OS_CHROMEOS)
 
 // Enable advanced gestures (e.g. for window management).
 const char kAshEnableAdvancedGestures[] = "ash-enable-advanced-gestures";
@@ -111,6 +116,13 @@ const char kAshEnableImmersiveFullscreen[] = "ash-enable-immersive-fullscreen";
 const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
 #endif
 
+#if defined(OS_CHROMEOS)
+// TODO(jamescook): Remove this unused flag. It exists only to allow the
+// "Enable new audio handler" about:flags item to have the tri-state
+// default/enabled/disabled UI.
+const char kAshEnableNewAudioHandler[] = "ash-enable-new-audio-handler";
+#endif
+
 // Enables the Oak tree viewer.
 const char kAshEnableOak[] = "ash-enable-oak";
 
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 429291ca07..cfe441df41 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -44,6 +44,7 @@ ASH_EXPORT extern const char kAshDisableDragAndDropAppListToLauncher[];
 #if defined(OS_CHROMEOS)
 ASH_EXPORT extern const char kAshDisableSoftwareMirroring[];
 ASH_EXPORT extern const char kAshDisableUsbChargerNotification[];
+ASH_EXPORT extern const char kAshEnableAudioDeviceMenu[];
 #endif
 ASH_EXPORT extern const char kAshEnableAdvancedGestures[];
 ASH_EXPORT extern const char kAshEnableBrightnessControl[];
@@ -52,6 +53,9 @@ ASH_EXPORT extern const char kAshEnableDockedWindows[];
 ASH_EXPORT extern const char kAshEnableMemoryMonitor[];
 #endif
 ASH_EXPORT extern const char kAshEnableImmersiveFullscreen[];
+#if defined(OS_CHROMEOS)
+ASH_EXPORT extern const char kAshEnableNewAudioHandler[];
+#endif
 ASH_EXPORT extern const char kAshEnableOak[];
 ASH_EXPORT extern const char kAshEnableStickyEdges[];
 ASH_EXPORT extern const char kAshEnableTrayDragging[];
diff --git a/ash/strings/ash_strings_it.xtb b/ash/strings/ash_strings_it.xtb
index ad099bae47..9fc41cc494 100644
--- a/ash/strings/ash_strings_it.xtb
+++ b/ash/strings/ash_strings_it.xtb
@@ -107,7 +107,7 @@ Premi Maiusc+Alt per cambiare metodo.</translation>
 <translation id="2372145515558759244">Sincronizzazione applicazioni...</translation>
 <translation id="7256405249507348194">Errore non riconosciuto: <ph name="DESC"/></translation>
 <translation id="7925247922861151263">Controllo AAA non riuscito</translation>
-<translation id="8456362689280298700"><ph name="HOUR"/>:<ph name="MINUTE"/> rimanenti al completamento della ricarica</translation>
+<translation id="8456362689280298700"><ph name="HOUR"/>:<ph name="MINUTE"/> per completare la ricarica</translation>
 <translation id="5787281376604286451">Feedback vocale attivato.
 Premi Ctrl+Alt+Z per disattivarlo.</translation>
 <translation id="4479639480957787382">Ethernet</translation>
@@ -195,7 +195,7 @@ Premi Alt+tasto per la ricerca o Maiusc per annullare.</translation>
 <translation id="4015692727874266537">Accedi a un altro account...</translation>
 <translation id="5941711191222866238">Riduci a icona</translation>
 <translation id="6911468394164995108">Connetti a un'altra...</translation>
-<translation id="412065659894267608"><ph name="HOUR"/> ore e <ph name="MINUTE"/> min rimanenti al completamento della ricarica</translation>
+<translation id="412065659894267608"><ph name="HOUR"/> h e <ph name="MINUTE"/> m per completare la ricarica</translation>
 <translation id="6359806961507272919">SMS da <ph name="PHONE_NUMBER"/></translation>
 <translation id="1244147615850840081">Gestore</translation>
 </translationbundle>
\ No newline at end of file
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 95af770aa6..5d75e945ab 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -172,7 +172,7 @@ class BluetoothDetailedView : public TrayDetailsView,
             IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, list[i].display_name);
         new_connecting_devices.insert(list[i].address);
         UpdateBluetoothDeviceList(&connecting_devices_, list[i]);
-      } else if (list[i].connected) {
+      } else if (list[i].connected && list[i].paired) {
         new_connected_devices.insert(list[i].address);
         UpdateBluetoothDeviceList(&connected_devices_, list[i]);
       } else if (list[i].paired) {