Add SystemTrayObservers

chrome/browser/chromeos/sms_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/sms_observer.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/sms_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/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 SmsObserver::SmsObserver(Profile* profile)
     : profile_(profile) {
@@ skipping 84 matching lines @@
   // TODO(dpokuhin): when libcros refactoring done, implement check for
   // "Message Waiting Indication" to filter out such messages.
   if (message.text.empty())
     return;
 
   // Add an Ash SMS notification. TODO(stevenjb): Replace this code with
   // NetworkSmsHandler when fixed: crbug.com/133416.
   base::DictionaryValue dict;
   dict.SetString(ash::kSmsNumberKey, message.number);
   dict.SetString(ash::kSmsTextKey, message.text);
-  if (ash::Shell::GetInstance()->status_area_widget())
-    ash::Shell::GetInstance()->system_tray()->sms_observer()->AddMessage(dict);
+  ash::SystemTrayObservers* observers =
+      ash::Shell::GetInstance()->tray_delegate()->GetSystemTrayObservers();
+  if (observers) {
+    FOR_EACH_OBSERVER(ash::SmsObserver,
+                      observers->sms_observers(),
+                      AddMessage(dict));
+  }
 }
 
 }  // namespace chromeos