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

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/content_settings_handler.cc	(revision 91771)
+++ chrome/browser/ui/webui/options/content_settings_handler.cc	(working copy)
@@ -21,6 +21,7 @@
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_helper.h"
 #include "chrome/common/pref_names.h"
@@ -273,25 +274,25 @@
                                   *block_3rd_party.get());
 
   notification_registrar_.Add(
-      this, NotificationType::OTR_PROFILE_CREATED,
+      this, chrome::OTR_PROFILE_CREATED,
       NotificationService::AllSources());
   notification_registrar_.Add(
-      this, NotificationType::PROFILE_DESTROYED,
+      this, chrome::PROFILE_DESTROYED,
       NotificationService::AllSources());
 
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
   notification_registrar_.Add(
-      this, NotificationType::CONTENT_SETTINGS_CHANGED,
+      this, chrome::CONTENT_SETTINGS_CHANGED,
       Source<HostContentSettingsMap>(settings_map));
   notification_registrar_.Add(
-      this, NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED,
+      this, chrome::DESKTOP_NOTIFICATION_DEFAULT_CHANGED,
       NotificationService::AllSources());
   notification_registrar_.Add(
-      this, NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
+      this, chrome::DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
       NotificationService::AllSources());
   notification_registrar_.Add(
-      this, NotificationType::PROTOCOL_HANDLER_REGISTRY_CHANGED,
+      this, chrome::PROTOCOL_HANDLER_REGISTRY_CHANGED,
       NotificationService::AllSources());
 
   PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
@@ -304,7 +305,7 @@
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   switch (type.value) {
-    case NotificationType::PROFILE_DESTROYED: {
+    case chrome::PROFILE_DESTROYED: {
       Profile* profile = static_cast<Source<Profile> >(source).ptr();
       if (profile->IsOffTheRecord()) {
         web_ui_->CallJavascriptFunction(
@@ -313,12 +314,12 @@
       break;
     }
 
-    case NotificationType::OTR_PROFILE_CREATED: {
+    case chrome::OTR_PROFILE_CREATED: {
       UpdateAllOTRExceptionsViewsFromModel();
       break;
     }
 
-    case NotificationType::CONTENT_SETTINGS_CHANGED: {
+    case chrome::CONTENT_SETTINGS_CHANGED: {
       const ContentSettingsDetails* settings_details =
           Details<const ContentSettingsDetails>(details).ptr();
 
@@ -330,7 +331,7 @@
       break;
     }
 
-    case NotificationType::PREF_CHANGED: {
+    case chrome::PREF_CHANGED: {
       const std::string& pref_name = *Details<std::string>(details).ptr();
       if (pref_name == prefs::kGeolocationDefaultContentSetting)
         UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_GEOLOCATION);
@@ -339,17 +340,17 @@
       break;
     }
 
-    case NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED: {
+    case chrome::DESKTOP_NOTIFICATION_DEFAULT_CHANGED: {
       UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
       break;
     }
 
-    case NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
+    case chrome::DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
       UpdateNotificationExceptionsView();
       break;
     }
 
-    case NotificationType::PROTOCOL_HANDLER_REGISTRY_CHANGED: {
+    case chrome::PROTOCOL_HANDLER_REGISTRY_CHANGED: {
       UpdateHandlersEnabledRadios();
       break;
     }