Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/chromeos/locale_change_guard.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.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/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
@@ skipping 11 matching lines @@
   chromeos::LocaleChangeGuard* master_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 LocaleChangeGuard::LocaleChangeGuard(Profile* profile)
     : profile_(profile),
       note_(NULL),
       reverted_(false) {
   DCHECK(profile_);
-  registrar_.Add(this, NotificationType::OWNERSHIP_CHECKED,
+  registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED,
                  NotificationService::AllSources());
 }
 
 LocaleChangeGuard::~LocaleChangeGuard() {}
 
 void LocaleChangeGuard::OnLogin() {
-  registrar_.Add(this, NotificationType::LOAD_COMPLETED_MAIN_FRAME,
+  registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  NotificationService::AllSources());
 }
 
 void LocaleChangeGuard::RevertLocaleChange(const ListValue* list) {
   if (note_ == NULL ||
       profile_ == NULL ||
       from_locale_.empty() ||
       to_locale_.empty()) {
     NOTREACHED();
     return;
   }
   if (reverted_)
     return;
   reverted_ = true;
   UserMetrics::RecordAction(UserMetricsAction("LanguageChange_Revert"));
   profile_->ChangeAppLocale(
       from_locale_, Profile::APP_LOCALE_CHANGED_VIA_REVERT);
 
   Browser* browser = Browser::GetTabbedBrowser(profile_, false);
   if (browser)
     browser->ExecuteCommand(IDC_EXIT);
 }
 
-void LocaleChangeGuard::Observe(NotificationType type,
+void LocaleChangeGuard::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   if (profile_ == NULL) {
     NOTREACHED();
     return;
   }
-  switch (type.value) {
-    case NotificationType::LOAD_COMPLETED_MAIN_FRAME: {
+  switch (type) {
+    case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
       // We need to perform locale change check only once, so unsubscribe.
-      registrar_.Remove(this, NotificationType::LOAD_COMPLETED_MAIN_FRAME,
+      registrar_.Remove(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                         NotificationService::AllSources());
       Check();
       break;
     }
-    case NotificationType::OWNERSHIP_CHECKED: {
+    case chrome::NOTIFICATION_OWNERSHIP_CHECKED: {
       if (UserManager::Get()->current_user_is_owner()) {
         PrefService* local_state = g_browser_process->local_state();
         if (local_state) {
           PrefService* prefs = profile_->GetPrefs();
           if (prefs == NULL) {
             NOTREACHED();
             return;
           }
           std::string owner_locale =
               prefs->GetString(prefs::kApplicationLocale);
@@ skipping 117 matching lines @@
   if (by_user)
     master_->AcceptLocaleChange();
 }
 
 std::string LocaleChangeGuard::Delegate::id() const {
   // Arbitrary unique Id.
   return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";
 }
 
 }  // namespace chromeos