Eliminate kAshNotifyDisabled and SystemNotification

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/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
-#include "base/command_line.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"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 28 matching lines @@
   virtual ~Delegate() {}
 
  private:
   chromeos::LocaleChangeGuard* master_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 LocaleChangeGuard::LocaleChangeGuard(Profile* profile)
     : profile_(profile),
-      note_(NULL),
       reverted_(false) {
   DCHECK(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
                  content::NotificationService::AllSources());
 }
 
 LocaleChangeGuard::~LocaleChangeGuard() {}
 
 void LocaleChangeGuard::OnLogin() {
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
@@ skipping 59 matching lines @@
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
 void LocaleChangeGuard::Check() {
-  if (note_ != NULL) {
-    // Somehow we are invoked more than once. Once is enough.
-    return;
-  }
-
   std::string cur_locale = g_browser_process->GetApplicationLocale();
   if (cur_locale.empty()) {
     NOTREACHED();
     return;
   }
 
   PrefService* prefs = profile_->GetPrefs();
   if (prefs == NULL) {
     NOTREACHED();
     return;
@@ skipping 15 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 (!CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshNotifyDisabled)) {
-    ash::Shell::GetInstance()->system_tray()->locale_observer()->
-        OnLocaleChanged(this, cur_locale, from_locale_, to_locale_);
-    return;
-  }
-
-  note_.reset(new chromeos::SystemNotification(
-      profile_,
-      new Delegate(this),
-      IDR_NOTIFICATION_LOCALE_CHANGE,
-      title_text_));
-  note_->Show(
-      message_text_, revert_link_text_,
-      base::Bind(&LocaleChangeGuard::RevertLocaleChangeCallback,
-                 AsWeakPtr()),
-                 true,  // urgent
-                 false);  // non-sticky
+  ash::Shell::GetInstance()->system_tray()->locale_observer()->
+      OnLocaleChanged(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