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

chrome/browser/extensions/extension_browser_event_router.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/extensions/extension_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 
 namespace events = extension_event_names;
 namespace tab_keys = extension_tabs_module_constants;
 namespace page_action_keys = extension_page_actions_module_constants;
 
@@ skipping 38 matching lines @@
   if (initialized_)
     return;
   BrowserList::AddObserver(this);
 #if defined(TOOLKIT_VIEWS)
   views::FocusManager::GetWidgetFocusManager()->AddFocusChangeListener(this);
 #elif defined(TOOLKIT_GTK)
   ui::ActiveWindowWatcherX::AddObserver(this);
 #elif defined(OS_MACOSX)
   // Needed for when no suitable window can be passed to an extension as the
   // currently focused window.
-  registrar_.Add(this, NotificationType::NO_KEY_WINDOW,
+  registrar_.Add(this, content::NOTIFICATION_NO_KEY_WINDOW,
                  NotificationService::AllSources());
 #endif
 
   // Init() can happen after the browser is running, so catch up with any
   // windows that already exist.
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end(); ++iter) {
     RegisterForBrowserNotifications(*iter);
 
     // Also catch up our internal bookkeeping of tab entries.
@@ skipping 34 matching lines @@
 }
 
 void ExtensionBrowserEventRouter::RegisterForBrowserNotifications(
     const Browser* browser) {
   // Start listening to TabStripModel events for this browser.
   browser->tabstrip_model()->AddObserver(this);
 
   // If this is a new window, it isn't ready at this point, so we register to be
   // notified when it is. If this is an existing window, this is a no-op that we
   // just do to reduce code complexity.
-  registrar_.Add(this, NotificationType::BROWSER_WINDOW_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       Source<const Browser>(browser));
 
   for (int i = 0; i < browser->tabstrip_model()->count(); ++i)
     RegisterForTabNotifications(browser->GetTabContentsAt(i));
 }
 
 void ExtensionBrowserEventRouter::RegisterForTabNotifications(
     TabContents* contents) {
-  registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  Source<NavigationController>(&contents->controller()));
 
   // Observing TAB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
   // a devtools TabContents that is opened in window, docked, then closed.
-  registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
+  registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  Source<TabContents>(contents));
 }
 
 void ExtensionBrowserEventRouter::UnregisterForTabNotifications(
     TabContents* contents) {
-  registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
+  registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&contents->controller()));
-  registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
+  registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       Source<TabContents>(contents));
 }
 
 void ExtensionBrowserEventRouter::OnBrowserWindowReady(const Browser* browser) {
   ListValue args;
 
   DictionaryValue* window_dictionary = ExtensionTabUtil::CreateWindowValue(
       browser, false);
   args.Append(window_dictionary);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(browser->profile(), events::kOnWindowCreated, json_args);
 }
 
 void ExtensionBrowserEventRouter::OnBrowserRemoved(const Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
 
   // Stop listening to TabStripModel events for this browser.
   browser->tabstrip_model()->RemoveObserver(this);
 
-  registrar_.Remove(this, NotificationType::BROWSER_WINDOW_READY,
+  registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       Source<const Browser>(browser));
 
   DispatchSimpleBrowserEvent(browser->profile(),
                              ExtensionTabUtil::GetWindowId(browser),
                              events::kOnWindowRemoved);
 }
 
 #if defined(TOOLKIT_VIEWS)
 void ExtensionBrowserEventRouter::NativeFocusWillChange(
     gfx::NativeView focused_before,
@@ skipping 291 matching lines @@
 
 ExtensionBrowserEventRouter::TabEntry* ExtensionBrowserEventRouter::GetTabEntry(
     const TabContents* contents) {
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   std::map<int, TabEntry>::iterator i = tab_entries_.find(tab_id);
   if (tab_entries_.end() == i)
     return NULL;
   return &i->second;
 }
 
-void ExtensionBrowserEventRouter::Observe(NotificationType type,
+void ExtensionBrowserEventRouter::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  if (type == NotificationType::NAV_ENTRY_COMMITTED) {
+  if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         Source<NavigationController>(source).ptr();
     TabUpdated(source_controller->tab_contents(), true);
-  } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
+  } else if (type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
     // Tab was destroyed after being detached (without being re-attached).
     TabContents* contents = Source<TabContents>(source).ptr();
-    registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
+    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         Source<NavigationController>(&contents->controller()));
-    registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
+    registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
         Source<TabContents>(contents));
-  } else if (type == NotificationType::BROWSER_WINDOW_READY) {
+  } else if (type == chrome::NOTIFICATION_BROWSER_WINDOW_READY) {
     const Browser* browser = Source<const Browser>(source).ptr();
     OnBrowserWindowReady(browser);
 #if defined(OS_MACOSX)
-  } else if (type == NotificationType::NO_KEY_WINDOW) {
+  } else if (type == content::NOTIFICATION_NO_KEY_WINDOW) {
     OnBrowserSetLastActive(NULL);
 #endif
   } else {
     NOTREACHED();
   }
 }
 
 void ExtensionBrowserEventRouter::TabChangedAt(TabContentsWrapper* contents,
                                                int index,
                                                TabChangeType change_type) {
@@ skipping 68 matching lines @@
 
 void ExtensionBrowserEventRouter::BrowserActionExecuted(
     Profile* profile, const std::string& extension_id, Browser* browser) {
   TabContentsWrapper* tab_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id))
     return;
   DispatchEventWithTab(profile, extension_id, "browserAction.onClicked",
                        tab_contents->tab_contents(), true);
 }