Add SystemTrayObservers

chrome/browser/chromeos/status/data_promo_notification.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/status/data_promo_notification.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_observers.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 174 matching lines @@
     int link_message_id;
     if (deal_topup_url_.empty())
       link_message_id = IDS_OFFLINE_NETWORK_SETTINGS;
     else
       link_message_id = IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT;
 
     std::vector<string16> links;
     links.push_back(l10n_util::GetStringUTF16(link_message_id));
     if (!deal_info_url_.empty())
       links.push_back(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
-    if (ash::Shell::GetInstance()->system_tray()->network_observer()) {
-      ash::Shell::GetInstance()->system_tray()->network_observer()->
+    ash::SystemTrayObservers* observers =
+        ash::Shell::GetInstance()->tray_delegate()->GetSystemTrayObservers();
+    if (observers) {
+      FOR_EACH_OBSERVER(
+          ash::NetworkObserver,
+          observers->network_observers(),
           SetNetworkMessage(listener, ash::NetworkObserver::MESSAGE_DATA_PROMO,
-              string16(), message, links);
+                            string16(), message, links));
     }
-
     check_for_promo_ = false;
     SetShow3gPromoNotification(false);
     if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void DataPromoNotification::CloseNotification() {
-  if (ash::Shell::GetInstance()->status_area_widget() &&
-      ash::Shell::GetInstance()->system_tray()->network_observer()) {
-    ash::Shell::GetInstance()->system_tray()->network_observer()->
-        ClearNetworkMessage(ash::NetworkObserver::MESSAGE_DATA_PROMO);
+  ash::SystemTrayObservers* observers =
+      ash::Shell::GetInstance()->tray_delegate()->GetSystemTrayObservers();
+  if (observers) {
+    FOR_EACH_OBSERVER(
+        ash::NetworkObserver,
+        observers->network_observers(),
+        ClearNetworkMessage(ash::NetworkObserver::MESSAGE_DATA_PROMO));
   }
 }
 
 }  // namespace chromeos