mash: Migrate remaining tray observers and notify functions.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
 #include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/session/logout_button_observer.h"
 #include "ash/common/system/chromeos/shutdown_policy_observer.h"
 #include "ash/common/system/date/clock_observer.h"
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/user/user_observer.h"
 #include "ash/common/system/volume_control_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
-#include "ash/system/chromeos/bluetooth/bluetooth_observer.h"
-#include "ash/system/chromeos/session/logout_button_observer.h"
 #include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
@@ skipping 827 matching lines @@
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         GetUserLoginStatus());
   }
 }
 
 ash::SystemTray* SystemTrayDelegateChromeOS::GetPrimarySystemTray() {
   return ash::Shell::GetInstance()->GetPrimarySystemTray();
 }
 
 ash::SystemTrayNotifier* SystemTrayDelegateChromeOS::GetSystemTrayNotifier() {
-  return ash::Shell::GetInstance()->system_tray_notifier();
-}
-
-ash::WmSystemTrayNotifier*
-SystemTrayDelegateChromeOS::GetWmSystemTrayNotifier() {
   return ash::WmShell::Get()->system_tray_notifier();
 }
 
 void SystemTrayDelegateChromeOS::SetProfile(Profile* profile) {
   // Stop observing the AppWindowRegistry of the current |user_profile_|.
   StopObservingAppWindowRegistry();
 
   // Stop observing custodian info changes of the current |user_profile_|.
   StopObservingCustodianInfoChanges();
 
@@ skipping 56 matching lines @@
 bool SystemTrayDelegateChromeOS::GetShouldUse24HourClockForTesting() const {
   return g_browser_process->platform_part()
       ->GetSystemClock()
       ->ShouldUse24HourClock();
 }
 
 void SystemTrayDelegateChromeOS::OnSystemClockChanged(
     system::SystemClock* system_clock) {
   const bool use_24_hour_clock = system_clock->ShouldUse24HourClock();
   clock_type_ = use_24_hour_clock ? base::k24HourClock : base::k12HourClock;
-  GetWmSystemTrayNotifier()->NotifyDateFormatChanged();
+  GetSystemTrayNotifier()->NotifyDateFormatChanged();
 }
 
 void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
   GetSystemTrayNotifier()->NotifyShowLoginButtonChanged(
       user_pref_registrar_->prefs()->GetBoolean(
           prefs::kShowLogoutButtonInTray));
 }
 
 void SystemTrayDelegateChromeOS::UpdateLogoutDialogDuration() {
   const int duration_ms =
@@ skipping 94 matching lines @@
 
 // content::NotificationObserver implementation.
 void SystemTrayDelegateChromeOS::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: {
       ash::UpdateInfo info;
       GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info);
-      GetWmSystemTrayNotifier()->NotifyUpdateRecommended(info);
+      GetSystemTrayNotifier()->NotifyUpdateRecommended(info);
       break;
     }
     case chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED: {
       // This notification is also sent on login screen when user avatar
       // is loaded from file.
       if (GetUserLoginStatus() != ash::LoginStatus::NOT_LOGGED_IN) {
         GetSystemTrayNotifier()->NotifyUserUpdate();
       }
       break;
     }
@@ skipping 24 matching lines @@
   }
 }
 
 void SystemTrayDelegateChromeOS::OnLanguageRemapSearchKeyToChanged() {
   search_key_mapped_to_ = user_pref_registrar_->prefs()->GetInteger(
       prefs::kLanguageRemapSearchKeyTo);
 }
 
 void SystemTrayDelegateChromeOS::OnAccessibilityModeChanged(
     ash::AccessibilityNotificationVisibility notify) {
-  GetWmSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify);
+  GetSystemTrayNotifier()->NotifyAccessibilityModeChanged(notify);
 }
 
 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() {
   if (!user_pref_registrar_)
     return;
   bool value = user_pref_registrar_->prefs()->GetBoolean(
       prefs::kPerformanceTracingEnabled);
-  GetWmSystemTrayNotifier()->NotifyTracingModeChanged(value);
+  GetSystemTrayNotifier()->NotifyTracingModeChanged(value);
 }
 
 // Overridden from InputMethodManager::Observer.
 void SystemTrayDelegateChromeOS::InputMethodChanged(
     input_method::InputMethodManager* manager,
     Profile* /* profile */,
     bool show_message) {
-  GetWmSystemTrayNotifier()->NotifyRefreshIME();
+  GetSystemTrayNotifier()->NotifyRefreshIME();
 }
 
 // Overridden from InputMethodMenuManager::Observer.
 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
     ui::ime::InputMethodMenuManager* manager) {
-  GetWmSystemTrayNotifier()->NotifyRefreshIME();
+  GetSystemTrayNotifier()->NotifyRefreshIME();
 }
 
 // Overridden from CrasAudioHandler::AudioObserver.
 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id,
                                                            int volume) {
-  GetWmSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume);
+  GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume);
 }
 
 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on,
                                                      bool system_adjust) {
-  GetWmSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on,
-                                                          system_adjust);
+  GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on, system_adjust);
 }
 
 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */,
                                                         int /* gain */) {
 }
 
 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) {
 }
 
 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() {
-  GetWmSystemTrayNotifier()->NotifyAudioNodesChanged();
+  GetSystemTrayNotifier()->NotifyAudioNodesChanged();
 }
 
 void SystemTrayDelegateChromeOS::OnActiveOutputNodeChanged() {
-  GetWmSystemTrayNotifier()->NotifyAudioActiveOutputNodeChanged();
+  GetSystemTrayNotifier()->NotifyAudioActiveOutputNodeChanged();
 }
 
 void SystemTrayDelegateChromeOS::OnActiveInputNodeChanged() {
-  GetWmSystemTrayNotifier()->NotifyAudioActiveInputNodeChanged();
+  GetSystemTrayNotifier()->NotifyAudioActiveInputNodeChanged();
 }
 
 // Overridden from BluetoothAdapter::Observer.
 void SystemTrayDelegateChromeOS::AdapterPresentChanged(
     device::BluetoothAdapter* adapter,
     bool present) {
   GetSystemTrayNotifier()->NotifyRefreshBluetooth();
 }
 
 void SystemTrayDelegateChromeOS::AdapterPoweredChanged(
@@ skipping 93 matching lines @@
 }
 
 void SystemTrayDelegateChromeOS::OnShutdownPolicyChanged(
     bool reboot_on_shutdown) {
   // Notify all observers.
   FOR_EACH_OBSERVER(ash::ShutdownPolicyObserver, shutdown_policy_observers_,
                     OnShutdownPolicyChanged(reboot_on_shutdown));
 }
 
 void SystemTrayDelegateChromeOS::ImeMenuActivationChanged(bool is_active) {
-  GetWmSystemTrayNotifier()->NotifyRefreshIMEMenu(is_active);
+  GetSystemTrayNotifier()->NotifyRefreshIMEMenu(is_active);
 }
 
 void SystemTrayDelegateChromeOS::ImeMenuListChanged() {}
 
 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged(
     const std::string& engine_id,
     const std::vector<input_method::InputMethodManager::MenuItem>& items) {}
 
 const base::string16
 SystemTrayDelegateChromeOS::GetLegacySupervisedUserMessage() const {
@@ skipping 28 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos