Move ash tray audio UI code from ash/system/audio to ash/system/chromeos/audio.

ash/system/tray/system_tray_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/system_tray_notifier.h"
 
 namespace ash {
 
 SystemTrayNotifier::SystemTrayNotifier() {
 }
 
 SystemTrayNotifier::~SystemTrayNotifier() {
 }
 
 void SystemTrayNotifier::AddAccessibilityObserver(
     AccessibilityObserver* observer) {
   accessibility_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveAccessibilityObserver(
     AccessibilityObserver* observer) {
   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);
 }
 
 void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) {
   bluetooth_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::AddBrightnessObserver(BrightnessObserver* observer) {
   brightness_observers_.AddObserver(observer);
@@ skipping 84 matching lines @@
 
 void SystemTrayNotifier::AddUserObserver(UserObserver* observer) {
   user_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) {
   user_observers_.RemoveObserver(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);
 }
 
 void SystemTrayNotifier::RemoveNetworkObserver(NetworkObserver* observer) {
   network_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::AddVpnObserver(NetworkObserver* observer) {
   vpn_observers_.AddObserver(observer);
@@ skipping 34 matching lines @@
 #endif
 
 void SystemTrayNotifier::NotifyAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   FOR_EACH_OBSERVER(
       AccessibilityObserver,
       accessibility_observers_,
       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_,
                     OnBluetoothRefresh());
 }
 
 void SystemTrayNotifier::NotifyBluetoothDiscoveringChanged() {
   FOR_EACH_OBSERVER(BluetoothObserver,
                     bluetooth_observers_,
                     OnBluetoothDiscoveringChanged());
@@ skipping 87 matching lines @@
 }
 
 void SystemTrayNotifier::NotifyUserUpdate() {
   FOR_EACH_OBSERVER(UserObserver,
                     user_observers_,
                     OnUserUpdate());
 }
 
 #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_,
                     OnNetworkRefresh(info));
 }
 
 void SystemTrayNotifier::NotifySetNetworkMessage(
     NetworkTrayDelegate* delegate,
     NetworkObserver::MessageType message_type,
     NetworkObserver::NetworkType network_type,
@@ skipping 48 matching lines @@
 }
 
 void SystemTrayNotifier::NotifyScreenCaptureStop() {
   FOR_EACH_OBSERVER(ScreenCaptureObserver, screen_capture_observers_,
                     OnScreenCaptureStop());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash