summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/status/input_method_menu.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
commit43211582b1fa8c69136385250e7b0446cf364b5c (patch)
tree655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/chromeos/status/input_method_menu.cc
parentd43970a7ceee5fc5433787b0f28b64234a4039f2 (diff)
downloadchromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.zip
chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.gz
chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.bz2
Moving notification types which are chrome specific to a new header file chrome_notification_types.h.
This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END which defines the end of the enum used by content to define notification types. The notificaton_type.h file in content\common has been renamed to content_notification_types.h BUG=76698 Review URL: http://codereview.chromium.org/7327007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/input_method_menu.cc')
-rw-r--r--chrome/browser/chromeos/status/input_method_menu.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index 20bd54e..2e7f7bb 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -15,6 +15,7 @@
#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"
@@ -162,7 +163,7 @@ InputMethodMenu::InputMethodMenu(PrefService* pref_service,
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());
}
}
@@ -677,10 +678,10 @@ void InputMethodMenu::RegisterPrefs(PrefService* local_state) {
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.