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

chrome/browser/ui/webui/options/core_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/core_options_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.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 "chrome/common/url_constants.h"
 #include "content/browser/user_metrics.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/gurl.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"
 
 CoreOptionsHandler::CoreOptionsHandler()
     : handlers_host_(NULL) {
 }
@@ skipping 56 matching lines @@
   }
 }
 
 WebUIMessageHandler* CoreOptionsHandler::Attach(WebUI* web_ui) {
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui);
   DCHECK(web_ui_);
   registrar_.Init(web_ui_->GetProfile()->GetPrefs());
   return result;
 }
 
-void CoreOptionsHandler::Observe(NotificationType type,
+void CoreOptionsHandler::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
-  if (type == NotificationType::PREF_CHANGED)
+  if (type == chrome::NOTIFICATION_PREF_CHANGED)
     NotifyPrefChanged(Details<std::string>(details).ptr());
 }
 
 void CoreOptionsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("coreOptionsInitialize",
       NewCallback(this, &CoreOptionsHandler::HandleInitialize));
   web_ui_->RegisterMessageCallback("fetchPrefs",
       NewCallback(this, &CoreOptionsHandler::HandleFetchPrefs));
   web_ui_->RegisterMessageCallback("observePrefs",
       NewCallback(this, &CoreOptionsHandler::HandleObservePrefs));
@@ skipping 269 matching lines @@
       dict->SetBoolean("managed", pref->IsManaged());
       dict->SetBoolean("extensionControlled", pref->IsExtensionControlled());
       dict->SetBoolean("disabled", !pref->IsUserModifiable());
       result_value.Append(dict);
 
       web_ui_->CallJavascriptFunction(WideToASCII(callback_function),
                                       result_value);
     }
   }
 }