Add SystemTrayObservers

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/logout_button/logout_button_observer.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/session_state_controller.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
@@ skipping 139 matching lines @@
         network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_icon_dark_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))),
         clock_type_(base::k24HourClock),
         search_key_mapped_to_(input_method::kSearchKey),
         screen_locked_(false),
         connected_network_state_(STATE_UNKNOWN),
         data_promo_notification_(new DataPromoNotification()),
-        volume_control_delegate_(ALLOW_THIS_IN_INITIALIZER_LIST(
-            new VolumeController)) {
+        volume_control_delegate_(new VolumeController()) {
     // Register notifications on construction so that events such as
     // PROFILE_CREATED do not get missed if they happen before Initialize().
     registrar_.Add(this,
                    chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                    content::NotificationService::AllSources());
     if (GetUserLoginStatus() == ash::user::LOGGED_IN_NONE) {
       registrar_.Add(this,
@@ skipping 427 matching lines @@
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 chrome::kBluetoothAddDeviceSubPage);
   }
 
   virtual void ToggleAirplaneMode() OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     crosnet->EnableOfflineMode(!crosnet->offline_mode());
   }
 
   virtual void ToggleWifi() OVERRIDE {
-    GetSystemTray()->network_observer()->OnWillToggleWifi();
+    GetSystemTrayNotifier()->NotifyWillToggleWifi();
     network_menu_->ToggleWifi();
   }
 
   virtual void ToggleMobile() OVERRIDE {
     network_menu_->ToggleMobile();
   }
 
   virtual void ToggleBluetooth() OVERRIDE {
     bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
                                    base::Bind(&base::DoNothing),
@@ skipping 93 matching lines @@
   virtual void SetVolumeControlDelegate(
       scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
     volume_control_delegate_.swap(delegate);
   }
 
  private:
   ash::SystemTray* GetSystemTray() {
     return ash::Shell::GetInstance()->system_tray();
   }
 
+  ash::SystemTrayNotifier* GetSystemTrayNotifier() {
+    return ash::Shell::GetInstance()->system_tray_notifier();
+  }
+
   // Returns the last active browser. If there is no such browser, creates a new
   // browser window with an empty tab and returns it.
   Browser* GetAppropriateBrowser() {
     return browser::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
   }
 
   void SetProfile(Profile* profile) {
     PrefService* prefs = profile->GetPrefs();
@@ skipping 12 matching lines @@
     DriveSystemService* system_service = FindDriveSystemService();
     if (!system_service)
       return;
 
     system_service->drive_service()->AddObserver(this);
   }
 
   void UpdateClockType(PrefServiceBase* service) {
     clock_type_ = service->GetBoolean(prefs::kUse24HourClock) ?
         base::k24HourClock : base::k12HourClock;
-    ash::ClockObserver* observer = GetSystemTray()->clock_observer();
-    if (observer)
-      observer->OnDateFormatChanged();
+    GetSystemTrayNotifier()->NotifyDateFormatChanged();
   }
 
   void UpdateShowLogoutButtonInTray(PrefServiceBase* service) {
-    ash::LogoutButtonObserver* observer =
-        GetSystemTray()->logout_button_observer();
-    if (observer) {
-      observer->OnShowLogoutButtonInTrayChanged(
-          service->GetBoolean(prefs::kShowLogoutButtonInTray));
-    }
-  }
-
-  void NotifyRefreshClock() {
-    ash::ClockObserver* observer = GetSystemTray()->clock_observer();
-    if (observer)
-      observer->Refresh();
+    GetSystemTrayNotifier()->NotifyShowLoginButtonChanged(
+        service->GetBoolean(prefs::kShowLogoutButtonInTray));
   }
 
   void NotifyRefreshNetwork() {
-    ash::NetworkObserver* observer = GetSystemTray()->network_observer();
     chromeos::NetworkLibrary* crosnet =
         chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-    if (observer) {
-      ash::NetworkIconInfo info;
-      info.image = network_icon_->GetIconAndText(&info.description);
-      info.tray_icon_visible = network_icon_->ShouldShowIconInTray();
-      observer->OnNetworkRefresh(info);
-    }
-
-    ash::NetworkObserver* vpn_observer = GetSystemTray()->vpn_observer();
-    if (vpn_observer) {
-      ash::NetworkIconInfo info;
-      info.image = network_icon_->GetIconAndText(&info.description);
-      info.tray_icon_visible = network_icon_->ShouldShowIconInTray();
-      vpn_observer->OnNetworkRefresh(info);
-    }
+    ash::NetworkIconInfo info;
+    info.image = network_icon_->GetIconAndText(&info.description);
+    info.tray_icon_visible = network_icon_->ShouldShowIconInTray();
+    GetSystemTrayNotifier()->NotifyRefreshNetwork(info);
+    GetSystemTrayNotifier()->NotifyVpnRefreshNetwork(info);
 
     // Update Accessibility.
 
     std::string connected_network_path;
     ConnectionState connected_network_state(STATE_UNKNOWN);
     if (crosnet->connected_network()) {
       connected_network_path = crosnet->connected_network()->service_path();
       connected_network_state = crosnet->connected_network()->state();
     }
     if (accessibility::IsSpokenFeedbackEnabled()) {
       bool speak = false;
       if ((connected_network_path_ != connected_network_path) ||
           (Network::IsConnectedState(connected_network_state_) &&
            !Network::IsConnectedState(connected_network_state)) ||
           (Network::IsConnectingState(connected_network_state_) &&
            !Network::IsConnectingState(connected_network_state)) ||
           (Network::IsDisconnectedState(connected_network_state_) &&
            !Network::IsDisconnectedState(connected_network_state))) {
         speak = true;
       }
 
       if (speak)
         AccessibilitySpeak(crosnet->connected_network());
     }
 
     connected_network_path_ = connected_network_path_;
     connected_network_state_ = connected_network_state;
   }
 
-  void NotifyRefreshBluetooth() {
-    ash::BluetoothObserver* observer = GetSystemTray()->bluetooth_observer();
-    if (observer)
-      observer->OnBluetoothRefresh();
-  }
-
-  void NotifyBluetoothDiscoveringChanged() {
-    ash::BluetoothObserver* observer = GetSystemTray()->bluetooth_observer();
-    if (observer)
-      observer->OnBluetoothDiscoveringChanged();
-  }
-
-  void NotifyRefreshIME(bool show_message) {
-    ash::IMEObserver* observer = GetSystemTray()->ime_observer();
-    if (observer)
-      observer->OnIMERefresh(show_message);
-  }
-
-  void NotifyRefreshDrive(ash::DriveOperationStatusList& list) {
-    ash::DriveObserver* observer = GetSystemTray()->drive_observer();
-    if (observer)
-      observer->OnDriveRefresh(list);
-  }
-
   void RefreshNetworkObserver(NetworkLibrary* crosnet) {
     const Network* network = crosnet->active_network();
     std::string new_path = network ? network->service_path() : std::string();
     if (active_network_path_ != new_path) {
       if (!active_network_path_.empty())
         crosnet->RemoveNetworkObserver(active_network_path_, this);
       if (!new_path.empty())
         crosnet->AddNetworkObserver(new_path, this);
       active_network_path_ = new_path;
     }
@@ skipping 101 matching lines @@
           l10n_util::GetStringUTF16(
               IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING));
     }
     added->insert(network);
     list->push_back(info);
   }
 
   // Overridden from AudioHandler::VolumeObserver.
   virtual void OnVolumeChanged() OVERRIDE {
     float level = AudioHandler::GetInstance()->GetVolumePercent() / 100.f;
-    GetSystemTray()->audio_observer()->OnVolumeChanged(level);
+    GetSystemTrayNotifier()->NotifyVolumeChanged(level);
   }
 
   // Overridden from AudioHandler::VolumeObserver.
   virtual void OnMuteToggled() OVERRIDE {
-    GetSystemTray()->audio_observer()->OnMuteToggled();
+    GetSystemTrayNotifier()->NotifyMuteToggled();
   }
 
   // Overridden from PowerManagerClient::Observer.
   virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE {
-    GetSystemTray()->brightness_observer()->
-        OnBrightnessChanged(static_cast<double>(level), user_initiated);
+    double leveld = static_cast<double>(level);
+    GetSystemTrayNotifier()->NotifyBrightnessChanged(leveld, user_initiated);
   }
 
   virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE {
     power_supply_status_ = power_status;
-    FOR_EACH_OBSERVER(ash::PowerStatusObserver,
-                      GetSystemTray()->power_status_observers(),
-                      OnPowerStatusChanged(power_status));
+    GetSystemTrayNotifier()->NotifyPowerStatusChanged(power_status);
   }
 
   virtual void SystemResumed() OVERRIDE {
-    NotifyRefreshClock();
+    GetSystemTrayNotifier()->NotifyRefreshClock();
   }
 
   // Overridden from SessionManagerClient::Observer.
   virtual void LockScreen() OVERRIDE {
     screen_locked_ = true;
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         GetUserLoginStatus());
   }
 
   virtual void UnlockScreen() OVERRIDE {
@@ skipping 68 matching lines @@
 
           case UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED:
             severity = ash::UpdateObserver::UPDATE_LOW_GREEN;
             break;
 
           case UpgradeDetector::UPGRADE_ANNOYANCE_LOW:
           default:
             severity = ash::UpdateObserver::UPDATE_NORMAL;
             break;
         }
-        ash::UpdateObserver* observer = GetSystemTray()->update_observer();
-        if (observer)
-          observer->OnUpdateRecommended(severity);
+        GetSystemTrayNotifier()->NotifyUpdateRecommended(severity);
         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::user::LOGGED_IN_NONE) {
-          ash::UserObserver* observer = GetSystemTray()->user_observer();
-          if (observer)
-            observer->OnUserUpdate();
+          GetSystemTrayNotifier()->NotifyUserUpdate();
         }
         break;
       }
       case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
         // GData system service exists by the time if enabled.
         ObserveGDataUpdates();
         break;
       }
       case chrome::NOTIFICATION_PROFILE_CREATED: {
         SetProfile(content::Source<Profile>(source).ptr());
@@ skipping 14 matching lines @@
   }
 
   virtual void OnPreferenceChanged(PrefServiceBase* service,
                                    const std::string& pref) OVERRIDE {
     if (pref == prefs::kUse24HourClock) {
       UpdateClockType(service);
     } else if (pref == prefs::kLanguageRemapSearchKeyTo) {
       search_key_mapped_to_ =
           service->GetInteger(prefs::kLanguageRemapSearchKeyTo);
     } else if (pref == prefs::kSpokenFeedbackEnabled) {
-      ash::AccessibilityObserver* observer =
-          GetSystemTray()->accessibility_observer();
-      if (observer) {
-        observer->OnAccessibilityModeChanged(
-            service->GetBoolean(prefs::kSpokenFeedbackEnabled));
-      }
+      GetSystemTrayNotifier()->NotifyAccessibilityModeChanged(
+          service->GetBoolean(prefs::kSpokenFeedbackEnabled));
     } else if (pref == prefs::kShowLogoutButtonInTray) {
       UpdateShowLogoutButtonInTray(service);
     } else {
       NOTREACHED();
     }
   }
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(
       input_method::InputMethodManager* manager, bool show_message) OVERRIDE {
-    NotifyRefreshIME(show_message);
+    GetSystemTrayNotifier()->NotifyRefreshIME(show_message);
   }
 
   virtual void InputMethodPropertyChanged(
       input_method::InputMethodManager* manager) OVERRIDE {
-    NotifyRefreshIME(false);
+    GetSystemTrayNotifier()->NotifyRefreshIME(false);
   }
 
   // google_apis::DriveServiceObserver overrides.
   virtual void OnProgressUpdate(
       const google_apis::OperationProgressStatusList& list) OVERRIDE {
     std::vector<ash::DriveOperationStatus> ui_list = GetDriveStatusList(list);
-    NotifyRefreshDrive(ui_list);
+    GetSystemTrayNotifier()->NotifyRefreshDrive(ui_list);
 
     // If we have something to report right now (i.e. completion status only),
     // we need to delayed re-check the status in few seconds to ensure we
     // raise events that will let us properly clear the uber tray state.
     if (list.size() > 0) {
       bool has_in_progress_items = false;
       for (google_apis::OperationProgressStatusList::const_iterator it =
                list.begin();
            it != list.end(); ++it) {
         if (it->transfer_state == google_apis::OPERATION_STARTED ||
@@ skipping 28 matching lines @@
     OnProgressUpdate(system_service->drive_service()->GetProgressStatusList());
   }
 
   DriveSystemService* FindDriveSystemService() {
     Profile* profile = ProfileManager::GetDefaultProfile();
     return DriveSystemServiceFactory::FindForProfile(profile);
   }
 
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE {
-    NotifyRefreshClock();
+    GetSystemTrayNotifier()->NotifyRefreshClock();
   }
 
   // Overridden from BluetoothAdapter::Observer.
   virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
                                      bool present) OVERRIDE {
-    NotifyRefreshBluetooth();
+    GetSystemTrayNotifier()->NotifyRefreshBluetooth();
   }
 
   virtual void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
                                      bool powered) OVERRIDE {
-    NotifyRefreshBluetooth();
+    GetSystemTrayNotifier()->NotifyRefreshBluetooth();
   }
 
   virtual void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
                                          bool discovering) OVERRIDE {
-    NotifyBluetoothDiscoveringChanged();
+    GetSystemTrayNotifier()->NotifyBluetoothDiscoveringChanged();
   }
 
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
                            device::BluetoothDevice* device) OVERRIDE {
-    NotifyRefreshBluetooth();
+    GetSystemTrayNotifier()->NotifyRefreshBluetooth();
   }
 
   virtual void DeviceChanged(device::BluetoothAdapter* adapter,
                              device::BluetoothDevice* device) OVERRIDE {
-    NotifyRefreshBluetooth();
+    GetSystemTrayNotifier()->NotifyRefreshBluetooth();
   }
 
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
                              device::BluetoothDevice* device) OVERRIDE {
-    NotifyRefreshBluetooth();
+    GetSystemTrayNotifier()->NotifyRefreshBluetooth();
   }
 
   // Overridden from SystemKeyEventListener::CapsLockObserver.
   virtual void OnCapsLockChange(bool enabled) OVERRIDE {
     bool search_mapped_to_caps_lock = false;
     if (!base::chromeos::IsRunningOnChromeOS() ||
         search_key_mapped_to_ == input_method::kCapsLockKey)
       search_mapped_to_caps_lock = true;
-
-    ash::CapsLockObserver* observer = GetSystemTray()->caps_lock_observer();
-    if (observer)
-      observer->OnCapsLockChanged(enabled, search_mapped_to_caps_lock);
+    GetSystemTrayNotifier()->NotifyCapsLockChanged(
+        enabled, search_mapped_to_caps_lock);
   }
 
   // Overridden from ash::NetworkTrayDelegate
   virtual void NotificationLinkClicked(size_t index) OVERRIDE {
     // If we have deal info URL defined that means that there're
     // 2 links in bubble. Let the user close it manually then thus giving
     // ability to navigate to second link.
     // mobile_data_bubble_ will be set to NULL in BubbleClosing callback.
     std::string deal_info_url = data_promo_notification_->deal_info_url();
     std::string deal_topup_url = data_promo_notification_->deal_topup_url();
@@ skipping 52 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos