Index: ash/system/tray/system_tray_notifier.cc |
diff --git a/ash/system/tray/system_tray_notifier.cc b/ash/system/tray/system_tray_notifier.cc |
index ae653a2b34abca63abd0f38911d1def4cd910505..c8fa2c39c7201b75bda701f3d4bc7ea783d74614 100644 |
--- a/ash/system/tray/system_tray_notifier.cc |
+++ b/ash/system/tray/system_tray_notifier.cc |
@@ -22,14 +22,6 @@ void SystemTrayNotifier::RemoveAccessibilityObserver( |
accessibility_observers_.RemoveObserver(observer); |
} |
-void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) { |
- audio_observers_.AddObserver(observer); |
-} |
- |
-void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) { |
- audio_observers_.RemoveObserver(observer); |
-} |
- |
void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) { |
bluetooth_observers_.AddObserver(observer); |
} |
@@ -134,6 +126,15 @@ void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) { |
} |
#if defined(OS_CHROMEOS) |
+ |
+void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) { |
+ audio_observers_.AddObserver(observer); |
+} |
+ |
+void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) { |
+ audio_observers_.RemoveObserver(observer); |
+} |
+ |
void SystemTrayNotifier::AddNetworkObserver(NetworkObserver* observer) { |
network_observers_.AddObserver(observer); |
} |
@@ -188,18 +189,6 @@ void SystemTrayNotifier::NotifyAccessibilityModeChanged( |
OnAccessibilityModeChanged(notify)); |
} |
-void SystemTrayNotifier::NotifyVolumeChanged(float level) { |
- FOR_EACH_OBSERVER(AudioObserver, |
- audio_observers_, |
- OnVolumeChanged(level)); |
-} |
- |
-void SystemTrayNotifier::NotifyMuteToggled() { |
- FOR_EACH_OBSERVER(AudioObserver, |
- audio_observers_, |
- OnMuteToggled()); |
-} |
- |
void SystemTrayNotifier::NotifyRefreshBluetooth() { |
FOR_EACH_OBSERVER(BluetoothObserver, |
bluetooth_observers_, |
@@ -307,6 +296,18 @@ void SystemTrayNotifier::NotifyUserUpdate() { |
#if defined(OS_CHROMEOS) |
+void SystemTrayNotifier::NotifyVolumeChanged(float level) { |
+ FOR_EACH_OBSERVER(AudioObserver, |
+ audio_observers_, |
+ OnVolumeChanged(level)); |
+} |
+ |
+void SystemTrayNotifier::NotifyMuteToggled() { |
+ FOR_EACH_OBSERVER(AudioObserver, |
+ audio_observers_, |
+ OnMuteToggled()); |
+} |
+ |
void SystemTrayNotifier::NotifyRefreshNetwork(const NetworkIconInfo &info) { |
FOR_EACH_OBSERVER(NetworkObserver, |
network_observers_, |