Add SystemTrayObservers

chrome/browser/chromeos/locale_change_guard.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/locale_change_guard.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_notifier.h"
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 145 matching lines @@
     return;  // Already accepted.
 
   // Locale change detected, showing notification.
   if (from_locale_ != from_locale || to_locale_ != to_locale) {
     // Falling back to showing message in current locale.
     LOG(ERROR) <<
         "Showing locale change notification in current (not previous) language";
     PrepareChangingLocale(from_locale, to_locale);
   }
 
-  if (ash::Shell::GetInstance()->status_area_widget()) {
-    ash::Shell::GetInstance()->system_tray()->locale_observer()->
-        OnLocaleChanged(this, cur_locale, from_locale_, to_locale_);
-  }
+  ash::Shell::GetInstance()->system_tray_notifier()->NotifyLocaleChanged(
+      this, cur_locale, from_locale_, to_locale_);
 }
 
 void LocaleChangeGuard::AcceptLocaleChange() {
   if (profile_ == NULL ||
       from_locale_.empty() ||
       to_locale_.empty()) {
     NOTREACHED();
     return;
   }
 
@@ skipping 40 matching lines @@
   if (by_user)
     master_->AcceptLocaleChange();
 }
 
 std::string LocaleChangeGuard::Delegate::id() const {
   // Arbitrary unique Id.
   return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";
 }
 
 }  // namespace chromeos