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

chrome/browser/chromeos/status/input_method_menu.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/status/input_method_menu.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/submenu_view.h"
@@ skipping 127 matching lines @@
     current_input_method_pref_.Init(
         prefs::kLanguageCurrentInputMethod, pref_service, this);
   }
 
   InputMethodManager* manager = InputMethodManager::GetInstance();
   manager->AddObserver(this);  // FirstObserverIsAdded() might be called back.
 
   if (screen_mode_ == StatusAreaHost::kLoginMode) {
     // This button is for the login screen.
     registrar_.Add(this,
-                   NotificationType::LOGIN_USER_CHANGED,
+                   chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    NotificationService::AllSources());
   }
 }
 
 InputMethodMenu::~InputMethodMenu() {
   // RemoveObserver() is no-op if |this| object is already removed from the
   // observer list.
   InputMethodManager::GetInstance()->RemoveObserver(this);
 }
 
@@ skipping 494 matching lines @@
 void InputMethodMenu::RegisterPrefs(PrefService* local_state) {
   // We use an empty string here rather than a hardware keyboard layout name
   // since input_method::GetHardwareInputMethodId() might return a fallback
   // layout name if local_state->RegisterStringPref(kHardwareKeyboardLayout)
   // is not called yet.
   local_state->RegisterStringPref(language_prefs::kPreferredKeyboardLayout,
                                   "",
                                   PrefService::UNSYNCABLE_PREF);
 }
 
-void InputMethodMenu::Observe(NotificationType type,
+void InputMethodMenu::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  if (type == NotificationType::LOGIN_USER_CHANGED) {
+  if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     // When a user logs in, we should remove |this| object from the observer
     // list so that PreferenceUpdateNeeded() does not update the local state
     // anymore.
     InputMethodManager::GetInstance()->RemoveObserver(this);
   }
 }
 
 void InputMethodMenu::SetMinimumWidth(int width) {
   // On the OOBE network selection screen, fixed width menu would be preferable.
   minimum_input_method_menu_width_ = width;
 }
 
 }  // namespace chromeos