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

chrome/browser/ui/webui/options/personal_options_handler.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/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #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"
 #include "chrome/common/url_constants.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/window.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #endif  // defined(OS_CHROMEOS)
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #endif  // defined(TOOLKIT_GTK)
 
 PersonalOptionsHandler::PersonalOptionsHandler() {
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   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
 }
 
 PersonalOptionsHandler::~PersonalOptionsHandler() {
   ProfileSyncService* sync_service =
       web_ui_->GetProfile()->GetProfileSyncService();
   if (sync_service)
     sync_service->RemoveObserver(this);
 }
@@ skipping 132 matching lines @@
       "themesSetGTK",
       NewCallback(this, &PersonalOptionsHandler::ThemesSetGTK));
 #endif
 #if defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback(
       "loadAccountPicture",
       NewCallback(this, &PersonalOptionsHandler::LoadAccountPicture));
 #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 {
     OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
 void PersonalOptionsHandler::OnStateChanged() {
   string16 status_label;
   string16 link_label;
@@ skipping 124 matching lines @@
       "options.PersonalOptions.setThemesResetButtonEnabled", enabled);
 }
 
 void PersonalOptionsHandler::Initialize() {
   banner_handler_.reset(
       OptionsManagedBannerHandler::Create(web_ui_,
                                           ASCIIToUTF16("PersonalOptions"),
                                           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();
 
   ProfileSyncService* sync_service =
       web_ui_->GetProfile()->GetProfileSyncService();
   if (sync_service) {
     sync_service->AddObserver(this);
     OnStateChanged();
 
     DictionaryValue args;
@@ skipping 34 matching lines @@
                      timestamp));
     web_ui_->CallJavascriptFunction("PersonalOptions.setAccountPicture",
                                     image_url);
 
     StringValue email_value(email);
     web_ui_->CallJavascriptFunction("AccountsOptions.updateAccountPicture",
                                     email_value, image_url);
   }
 }
 #endif