| Index: chrome/browser/ui/webui/options/personal_options_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/options/personal_options_handler.cc (revision 91968)
|
| +++ chrome/browser/ui/webui/options/personal_options_handler.cc (working copy)
|
| @@ -24,6 +24,7 @@
|
| #include "chrome/browser/themes/theme_service.h"
|
| #include "chrome/browser/themes/theme_service_factory.h"
|
| #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/net/gaia/google_service_auth_error.h"
|
| @@ -52,7 +53,7 @@
|
| multiprofile_ = browser_command_line.HasSwitch(switches::kMultiProfiles);
|
| #if defined(OS_CHROMEOS)
|
| registrar_.Add(this,
|
| - NotificationType::LOGIN_USER_IMAGE_CHANGED,
|
| + chrome::LOGIN_USER_IMAGE_CHANGED,
|
| NotificationService::AllSources());
|
| #endif
|
| }
|
| @@ -205,13 +206,13 @@
|
| #endif
|
| }
|
|
|
| -void PersonalOptionsHandler::Observe(NotificationType type,
|
| +void PersonalOptionsHandler::Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| - if (type == NotificationType::BROWSER_THEME_CHANGED) {
|
| + if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
|
| ObserveThemeChanged();
|
| #if defined(OS_CHROMEOS)
|
| - } else if (type == NotificationType::LOGIN_USER_IMAGE_CHANGED) {
|
| + } else if (type == chrome::LOGIN_USER_IMAGE_CHANGED) {
|
| LoadAccountPicture(NULL);
|
| #endif
|
| } else {
|
| @@ -356,7 +357,7 @@
|
| OPTIONS_PAGE_CONTENT));
|
|
|
| // Listen for theme installation.
|
| - registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
|
| + registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
|
| NotificationService::AllSources());
|
| ObserveThemeChanged();
|
|
|
|
|