Add SystemTrayObservers

chrome/browser/chromeos/network_message_observer.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/network_message_observer.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.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/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 43 matching lines @@
   }
 
   // Overridden from ash::NetworkTrayDelegate:
   virtual void NotificationLinkClicked(size_t index) OVERRIDE {
     base::ListValue empty_value;
     if (!callback_.is_null())
       callback_.Run(&empty_value);
   }
 
   void Hide() {
-    ash::Shell::GetInstance()->system_tray()->network_observer()->
-        ClearNetworkMessage(error_type_);
+    ash::SystemTrayObservers* observers =
+        ash::Shell::GetInstance()->tray_delegate()->GetSystemTrayObservers();
+    if (observers) {
+      FOR_EACH_OBSERVER(ash::NetworkObserver,
+                        observers->network_observers(),
+                        ClearNetworkMessage(error_type_));
+    }
   }
 
   void SetTitle(const string16& title) {
     title_ = title;
   }
 
   void Show(const string16& message,
             const string16& link_text,
             const BalloonViewHost::MessageCallback& callback,
             bool urgent, bool sticky) {
     callback_ = callback;
     std::vector<string16> links;
     links.push_back(link_text);
-    ash::Shell::GetInstance()->system_tray()->network_observer()->
-        SetNetworkMessage(this, error_type_, title_, message, links);
+    ash::SystemTrayObservers* observers =
+        ash::Shell::GetInstance()->tray_delegate()->GetSystemTrayObservers();
+    if (observers) {
+      FOR_EACH_OBSERVER(
+          ash::NetworkObserver,
+          observers->network_observers(),
+          SetNetworkMessage(this, error_type_, title_, message, links));
+    }
   }
 
   void ShowAlways(const string16& message,
                   const string16& link_text,
                   const BalloonViewHost::MessageCallback& callback,
                   bool urgent, bool sticky) {
     Show(message, link_text, callback, urgent, sticky);
   }
 
  private:
@@ skipping 261 matching lines @@
   if (plan) {
     cellular_data_plan_unique_id_ = plan->GetUniqueIdentifier();
     cellular_data_plan_type_ = plan->plan_type;
   } else {
     cellular_data_plan_unique_id_ = std::string();
     cellular_data_plan_type_ = CELLULAR_DATA_PLAN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos