chromeos: Combine TrayAudio and TrayAudioChromeOs classes

ash/common/system/tray/system_tray_notifier.cc

 // Copyright 2016 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/common/system/tray/system_tray_notifier.h"
 
 #include "ash/common/system/accessibility_observer.h"
-#include "ash/common/system/audio/audio_observer.h"
 #include "ash/common/system/date/clock_observer.h"
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/user/user_observer.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/audio/audio_observer.h"
 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
 #include "ash/common/system/chromeos/enterprise/enterprise_domain_observer.h"
 #include "ash/common/system/chromeos/media_security/media_capture_observer.h"
 #include "ash/common/system/chromeos/network/network_observer.h"
 #include "ash/common/system/chromeos/network/network_portal_detector_observer.h"
 #include "ash/common/system/chromeos/screen_security/screen_capture_observer.h"
 #include "ash/common/system/chromeos/screen_security/screen_share_observer.h"
 #include "ash/common/system/chromeos/session/last_window_closed_observer.h"
 #include "ash/common/system/chromeos/session/logout_button_observer.h"
 #include "ash/common/system/chromeos/session/session_length_limit_observer.h"
@@ skipping 16 matching lines @@
     AccessibilityObserver* observer) {
   accessibility_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::NotifyAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   for (auto& observer : accessibility_observers_)
     observer.OnAccessibilityModeChanged(notify);
 }
 
-void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) {
-  audio_observers_.AddObserver(observer);
-}
-
-void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) {
-  audio_observers_.RemoveObserver(observer);
-}
-
-void SystemTrayNotifier::NotifyAudioOutputVolumeChanged(uint64_t node_id,
-                                                        double volume) {
-  for (auto& observer : audio_observers_)
-    observer.OnOutputNodeVolumeChanged(node_id, volume);
-}
-
-void SystemTrayNotifier::NotifyAudioOutputMuteChanged(bool mute_on,
-                                                      bool system_adjust) {
-  for (auto& observer : audio_observers_)
-    observer.OnOutputMuteChanged(mute_on, system_adjust);
-}
-
-void SystemTrayNotifier::NotifyAudioNodesChanged() {
-  for (auto& observer : audio_observers_)
-    observer.OnAudioNodesChanged();
-}
-
-void SystemTrayNotifier::NotifyAudioActiveOutputNodeChanged() {
-  for (auto& observer : audio_observers_)
-    observer.OnActiveOutputNodeChanged();
-}
-
-void SystemTrayNotifier::NotifyAudioActiveInputNodeChanged() {
-  for (auto& observer : audio_observers_)
-    observer.OnActiveInputNodeChanged();
-}
-
 void SystemTrayNotifier::AddClockObserver(ClockObserver* observer) {
   clock_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveClockObserver(ClockObserver* observer) {
   clock_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::NotifyRefreshClock() {
   for (auto& observer : clock_observers_)
@@ skipping 57 matching lines @@
 void SystemTrayNotifier::NotifyUserUpdate() {
   for (auto& observer : user_observers_)
     observer.OnUserUpdate();
 }
 
 void SystemTrayNotifier::NotifyUserAddedToSession() {
   for (auto& observer : user_observers_)
     observer.OnUserAddedToSession();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 #if defined(OS_CHROMEOS)
 
+void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) {
+  audio_observers_.AddObserver(observer);
+}
+
+void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) {
+  audio_observers_.RemoveObserver(observer);
+}
+
+void SystemTrayNotifier::NotifyAudioOutputVolumeChanged(uint64_t node_id,
+                                                        double volume) {
+  for (auto& observer : audio_observers_)
+    observer.OnOutputNodeVolumeChanged(node_id, volume);
+}
+
+void SystemTrayNotifier::NotifyAudioOutputMuteChanged(bool mute_on,
+                                                      bool system_adjust) {
+  for (auto& observer : audio_observers_)
+    observer.OnOutputMuteChanged(mute_on, system_adjust);
+}
+
+void SystemTrayNotifier::NotifyAudioNodesChanged() {
+  for (auto& observer : audio_observers_)
+    observer.OnAudioNodesChanged();
+}
+
+void SystemTrayNotifier::NotifyAudioActiveOutputNodeChanged() {
+  for (auto& observer : audio_observers_)
+    observer.OnActiveOutputNodeChanged();
+}
+
+void SystemTrayNotifier::NotifyAudioActiveInputNodeChanged() {
+  for (auto& observer : audio_observers_)
+    observer.OnActiveInputNodeChanged();
+}
+
 void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) {
   bluetooth_observers_.AddObserver(observer);
 }
 
 void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) {
   bluetooth_observers_.RemoveObserver(observer);
 }
 
 void SystemTrayNotifier::NotifyRefreshBluetooth() {
   for (auto& observer : bluetooth_observers_)
@@ skipping 188 matching lines @@
 
 void SystemTrayNotifier::NotifyVirtualKeyboardSuppressionChanged(
     bool suppressed) {
   for (auto& observer : virtual_keyboard_observers_)
     observer.OnKeyboardSuppressionChanged(suppressed);
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash