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

content/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/stringprintf.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/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/devtools_window.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
@@ skipping 78 matching lines @@
   tab_contents_->controller().LoadURL(
       GetDevToolsUrl(), GURL(), PageTransition::START_PAGE);
 
   // Wipe out page icon so that the default application icon is used.
   NavigationEntry* entry = tab_contents_->controller().GetActiveEntry();
   entry->favicon().set_bitmap(SkBitmap());
   entry->favicon().set_is_valid(true);
 
   // Register on-load actions.
   registrar_.Add(this,
-                 NotificationType::LOAD_STOP,
+                 content::NOTIFICATION_LOAD_STOP,
                  Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(this,
-                 NotificationType::TAB_CLOSING,
+                 content::NOTIFICATION_TAB_CLOSING,
                  Source<NavigationController>(&tab_contents_->controller()));
   registrar_.Add(
       this,
-      NotificationType::BROWSER_THEME_CHANGED,
+      chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       Source<ThemeService>(ThemeServiceFactory::GetForProfile(profile_)));
   TabContents* tab = inspected_rvh->delegate()->GetAsTabContents();
   if (tab)
     inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab);
 
   instances_.push_back(this);
 }
 
 DevToolsWindow::~DevToolsWindow() {
   DevToolsWindowList::iterator it = std::find(instances_.begin(),
@@ skipping 245 matching lines @@
 void DevToolsWindow::CallClientFunction(const string16& function_name,
                                         const Value& arg) {
   std::string json;
   base::JSONWriter::Write(&arg, false, &json);
   string16 javascript = function_name + char16('(') + UTF8ToUTF16(json) +
       ASCIIToUTF16(");");
   tab_contents_->render_view_host()->
       ExecuteJavascriptInWebFrame(string16(), javascript);
 }
 
-void DevToolsWindow::Observe(NotificationType type,
+void DevToolsWindow::Observe(int type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
-  if (type == NotificationType::LOAD_STOP && !is_loaded_) {
+  if (type == content::NOTIFICATION_LOAD_STOP && !is_loaded_) {
     is_loaded_ = true;
     UpdateTheme();
     DoAction();
     AddDevToolsExtensionsToClient();
-  } else if (type == NotificationType::TAB_CLOSING) {
+  } else if (type == content::NOTIFICATION_TAB_CLOSING) {
     if (Source<NavigationController>(source).ptr() ==
             &tab_contents_->controller()) {
       // This happens when browser closes all of its tabs as a result
       // of window.Close event.
       // Notify manager that this DevToolsClientHost no longer exists and
       // initiate self-destuct here.
       NotifyCloseListener();
       delete this;
     }
-  } else if (type == NotificationType::BROWSER_THEME_CHANGED) {
+  } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     UpdateTheme();
   }
 }
 
 void DevToolsWindow::ScheduleAction(DevToolsToggleAction action) {
   action_on_load_ = action;
   if (is_loaded_)
     DoAction();
 }
 
@@ skipping 135 matching lines @@
     DevToolsClientHost* client_host) {
   if (!client_host)
     return NULL;
   DevToolsWindowList::iterator it = std::find(instances_.begin(),
                                               instances_.end(),
                                               client_host);
   if (it == instances_.end())
     return NULL;
   return *it;
 }