diff options
-rw-r--r-- | ash/ash_switches.cc | 11 | ||||
-rw-r--r-- | ash/ash_switches.h | 1 | ||||
-rw-r--r-- | ash/system/chromeos/power/tray_power.cc | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 80e7654..51ecfc6 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -68,10 +68,6 @@ const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf"; const char kAshDisableOverviewMode[] = "ash-disable-overview-mode"; #if defined(OS_CHROMEOS) -// Disable the notification when a low-power USB charger is connected. -const char kAshDisableUsbChargerNotification[] = - "ash-disable-usb-charger-notification"; - // 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. @@ -208,12 +204,5 @@ bool ShowAudioDeviceMenu() { #endif } -#if defined(OS_CHROMEOS) -bool UseUsbChargerNotification() { - return !CommandLine::ForCurrentProcess()-> - HasSwitch(kAshDisableUsbChargerNotification); -} -#endif - } // namespace switches } // namespace ash diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 08b28f4..24c3a2ee 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -34,7 +34,6 @@ ASH_EXPORT extern const char kAshDisableDockedWindows[]; ASH_EXPORT extern const char kAshDisableDragOffShelf[]; ASH_EXPORT extern const char kAshDisableOverviewMode[]; #if defined(OS_CHROMEOS) -ASH_EXPORT extern const char kAshDisableUsbChargerNotification[]; ASH_EXPORT extern const char kAshEnableAudioDeviceMenu[]; #endif ASH_EXPORT extern const char kAshEnableAdvancedGestures[]; diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index 2b389af..de3ff76 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -242,8 +242,7 @@ void TrayPower::OnPowerStatusChanged() { ash::switches::kAshHideNotificationsForFactory)) return; - if (ash::switches::UseUsbChargerNotification()) - MaybeShowUsbChargerNotification(); + MaybeShowUsbChargerNotification(); if (battery_alert) ShowNotificationView(); |