Close notification windows while message loop is still active

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"
@@ skipping 586 matching lines @@
 
   virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE {
     GetAppropriateBrowser()->ShowSingletonTab(GURL(topup_url));
   }
 
   virtual void ChangeProxySettings() OVERRIDE {
     CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
     BaseLoginDisplayHost::default_host()->OpenProxySettings();
   }
 
+  virtual void OnTrayDestroyed() OVERRIDE {
+    tray_ = NULL;

[Ben Goodger (Google), 2012/04/12 23:33:56]

rather than NULL checking everything in this file, can we just remove this
object as an observer from the various things it observes?

[oshima, 2012/04/12 23:50:27]

Yes, I thought about it. I still need NULL check for
Shell::GetInstance()->tray_delegate() (but not all places),
and I felt it's cleaner to do NULL check in one place instead of
doing this in multiple places.

This NULL check is necessary only if we close tray/widgets before
message loop is destroyed, so another option is to exclude it for now.

Let me know which way you prefer.

+  }
+
  private:
   // 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::GetOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord());
   }
 
   void SetProfile(Profile* profile) {
     pref_registrar_.reset(new PrefChangeRegistrar);
     pref_registrar_->Init(profile->GetPrefs());
     pref_registrar_->Add(prefs::kUse24HourClock, this);
     pref_registrar_->Add(prefs::kLanguageXkbRemapSearchKeyTo, this);
     UpdateClockType(profile->GetPrefs());
     search_key_mapped_to_ =
         profile->GetPrefs()->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo);
   }
 
   void UpdateClockType(PrefService* service) {
     clock_type_ = service->GetBoolean(prefs::kUse24HourClock) ?
         base::k24HourClock : base::k12HourClock;
-    ash::ClockObserver* observer =
-        ash::Shell::GetInstance()->tray()->clock_observer();
+    ash::ClockObserver* observer = tray_ ? tray_->clock_observer() : NULL;
     if (observer)
       observer->OnDateFormatChanged();
   }
 
   void NotifyRefreshClock() {
-    ash::ClockObserver* observer =
-        ash::Shell::GetInstance()->tray()->clock_observer();
+    ash::ClockObserver* observer = tray_ ? tray_->clock_observer() : NULL;
     if (observer)
       observer->Refresh();
   }
 
   void NotifyRefreshNetwork() {
-    ash::NetworkObserver* observer =
-        ash::Shell::GetInstance()->tray()->network_observer();
+    ash::NetworkObserver* observer = tray_ ? tray_->network_observer() : NULL;
     if (observer) {
       NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
       ash::NetworkIconInfo info;
       info.image = network_icon_->GetIconAndText(&info.description);
       info.tray_icon_visible =
           ShouldShowNetworkIconInTray(crosnet->connected_network());
       observer->OnNetworkRefresh(info);
     }
   }
 
   void NotifyRefreshBluetooth() {
     ash::BluetoothObserver* observer =
-        ash::Shell::GetInstance()->tray()->bluetooth_observer();
+        tray_ ? tray_->bluetooth_observer() : NULL;
     if (observer)
       observer->OnBluetoothRefresh();
   }
 
   void NotifyRefreshIME() {
-    ash::IMEObserver* observer =
-        ash::Shell::GetInstance()->tray()->ime_observer();
+    ash::IMEObserver* observer = tray_ ? tray_->ime_observer() : NULL;
     if (observer)
       observer->OnIMERefresh();
   }
 
   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;
     }
   }
 
   void RefreshNetworkDeviceObserver(NetworkLibrary* crosnet) {
     const NetworkDevice* cellular = crosnet->FindCellularDevice();
     std::string new_cellular_device_path = cellular ?
         cellular->device_path() : std::string();
     if (cellular_device_path_ != new_cellular_device_path)
       cellular_device_path_ = new_cellular_device_path;
   }
 
   // Overridden from AudioHandler::VolumeObserver.
   virtual void OnVolumeChanged() OVERRIDE {
-    float level = AudioHandler::GetInstance()->GetVolumePercent() / 100.f;
-    ash::Shell::GetInstance()->tray()->audio_observer()->
-        OnVolumeChanged(level);
+    if (tray_) {
+      float level = AudioHandler::GetInstance()->GetVolumePercent() / 100.f;
+      tray_->audio_observer()->OnVolumeChanged(level);
+    }
   }
 
   // Overridden from PowerManagerClient::Observer.
   virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE {
-    ash::Shell::GetInstance()->tray()->brightness_observer()->
-        OnBrightnessChanged(static_cast<double>(level), user_initiated);
+    if (tray_) {
+      tray_->brightness_observer()->
+          OnBrightnessChanged(static_cast<double>(level), user_initiated);
+    }
   }
 
   virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE {
     power_supply_status_ = power_status;
     ash::PowerStatusObserver* observer =
-        ash::Shell::GetInstance()->tray()->power_status_observer();
+        tray_ ? tray_->power_status_observer() : NULL;
     if (observer)
       observer->OnPowerStatusChanged(power_status);
   }
 
   virtual void SystemResumed() OVERRIDE {
     NotifyRefreshClock();
   }
 
   virtual void LockScreen() OVERRIDE {
     screen_locked_ = true;
-    tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+    if (tray_)
+      tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
   }
 
   virtual void UnlockScreen() OVERRIDE {
     screen_locked_ = false;
-    tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+    if (tray_)
+      tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
   }
 
   virtual void UnlockScreenFailed() OVERRIDE {
   }
 
   // TODO(sad): Override more from PowerManagerClient::Observer here (e.g.
   // PowerButtonStateChanged etc.).
 
   // Overridden from NetworkMenuIcon::Delegate.
   virtual void NetworkMenuIconChanged() OVERRIDE {
@@ skipping 16 matching lines @@
   }
 
   virtual bool ShouldOpenButtonOptions() const OVERRIDE {
     return false;
   }
 
   // Overridden from NetworkLibrary::NetworkManagerObserver.
   virtual void OnNetworkManagerChanged(NetworkLibrary* crosnet) OVERRIDE {
     RefreshNetworkObserver(crosnet);
     RefreshNetworkDeviceObserver(crosnet);
-    data_promo_notification_->ShowOptionalMobileDataPromoNotification(crosnet,
-        tray_, this);
+    if (tray_) {
+      data_promo_notification_->ShowOptionalMobileDataPromoNotification(
+          crosnet, tray_, this);
+    }
 
     NotifyRefreshNetwork();
   }
 
   // Overridden from NetworkLibrary::NetworkObserver.
   virtual void OnNetworkChanged(NetworkLibrary* crosnet,
       const Network* network) OVERRIDE {
     NotifyRefreshNetwork();
   }
 
   // Overridden from NetworkLibrary::CellularDataPlanObserver.
   virtual void OnCellularDataPlanChanged(NetworkLibrary* crosnet) OVERRIDE {
     NotifyRefreshNetwork();
   }
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
-        tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+        if (tray_)
+          tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
         break;
       }
       case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: {
-        ash::UpdateObserver* observer =
-            ash::Shell::GetInstance()->tray()->update_observer();
+        ash::UpdateObserver* observer = tray_ ? tray_->update_observer() : NULL;
         if (observer)
           observer->OnUpdateRecommended();
         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 =
-              ash::Shell::GetInstance()->tray()->user_observer();
+          ash::UserObserver* observer = tray_ ? tray_->user_observer() : NULL;
           if (observer)
             observer->OnUserUpdate();
         }
         break;
       }
       case chrome::NOTIFICATION_PREF_CHANGED: {
         std::string pref = *content::Details<std::string>(details).ptr();
         PrefService* service = content::Source<PrefService>(source).ptr();
         if (pref == prefs::kUse24HourClock) {
           UpdateClockType(service);
         } else if (pref == prefs::kLanguageXkbRemapSearchKeyTo) {
           search_key_mapped_to_ =
               service->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo);
         } else if (pref == prefs::kSpokenFeedbackEnabled) {
           ash::AccessibilityObserver* observer =
-              ash::Shell::GetInstance()->tray()->accessibility_observer();
+              tray_ ? tray_->accessibility_observer() : NULL;
           if (observer) {
             observer->OnAccessibilityModeChanged(
                 service->GetBoolean(prefs::kSpokenFeedbackEnabled),
                 IDS_STATUSBAR_ACCESSIBILITY_TURNED_ON_BUBBLE);
           }
         } else {
           NOTREACHED();
         }
         break;
       }
@@ skipping 72 matching lines @@
   }
 
   // Overridden from SystemKeyEventListener::CapsLockObserver.
   virtual void OnCapsLockChange(bool enabled) OVERRIDE {
     int id = IDS_STATUSBAR_CAPS_LOCK_ENABLED_PRESS_SHIFT_AND_SEARCH_KEYS;
     if (!base::chromeos::IsRunningOnChromeOS() ||
         search_key_mapped_to_ == input_method::kCapsLockKey)
       id = IDS_STATUSBAR_CAPS_LOCK_ENABLED_PRESS_SEARCH;
 
     ash::CapsLockObserver* observer =
-      ash::Shell::GetInstance()->tray()->caps_lock_observer();
+        tray_ ? tray_->caps_lock_observer() : NULL;
     if (observer)
       observer->OnCapsLockChanged(enabled, id);
   }
 
   // Overridden from MessageBubbleLinkListener
   virtual void OnLinkActivated(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.
@@ skipping 48 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos