Add SystemTrayObservers

chrome/browser/chromeos/network_message_observer.cc

Index: chrome/browser/chromeos/network_message_observer.cc
diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc
index 5e24899b930248001f74a2ccac52a309f89835c0..367d163af385f4b1f440eb5f4159b3cddf855c8f 100644
--- a/chrome/browser/chromeos/network_message_observer.cc
+++ b/chrome/browser/chromeos/network_message_observer.cc
@@ -8,6 +8,8 @@
 #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"
@@ -71,8 +73,13 @@ class NetworkMessageNotification : public ash::NetworkTrayDelegate {
   }
 
   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) {
@@ -86,8 +93,14 @@ class NetworkMessageNotification : public ash::NetworkTrayDelegate {
     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,