diff options
Diffstat (limited to 'chrome/browser/chromeos/status')
4 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 5880b0b..3828bb6 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -12,6 +12,7 @@ #include "chrome/browser/chromeos/status/status_area_host.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/common/notification_details.h" #include "content/common/notification_source.h" @@ -98,10 +99,10 @@ void ClockMenuButton::UpdateText() { // ClockMenuButton, NotificationObserver implementation: -void ClockMenuButton::Observe(NotificationType type, +void ClockMenuButton::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::PREF_CHANGED) { + if (type == chrome::NOTIFICATION_PREF_CHANGED) { std::string* pref_name = Details<std::string>(details).ptr(); if (*pref_name == prefs::kUse24HourClock) { UpdateText(); diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h index d6fd4ee..7864b97 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.h +++ b/chrome/browser/chromeos/status/clock_menu_button.h @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/status/status_area_button.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_member.h" +#include "content/common/content_notification_types.h" #include "content/common/notification_observer.h" -#include "content/common/notification_type.h" #include "chrome/browser/chromeos/system/timezone_settings.h" #include "unicode/calendar.h" #include "views/controls/button/menu_button.h" @@ -60,7 +60,7 @@ class ClockMenuButton : public StatusAreaButton, void UpdateText(); // NotificationObserver implementation. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); 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. diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index 22dbb15..be736d9 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -11,9 +11,9 @@ #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/status/status_area_host.h" #include "chrome/browser/prefs/pref_member.h" +#include "content/common/content_notification_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" -#include "content/common/notification_type.h" #include "ui/base/models/menu_model.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/view_menu_delegate.h" @@ -89,7 +89,7 @@ class InputMethodMenu : public views::ViewMenuDelegate, virtual void FirstObserverIsAdded(input_method::InputMethodManager* manager); // NotificationObserver implementation. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); |