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

chrome/browser/extensions/extension_tab_id_map.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_tab_id_map.h"
 
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 13 matching lines @@
 // This class listens for notifications about new and closed tabs on the UI
 // thread, and notifies the ExtensionTabIdMap on the IO thread. It should only
 // ever be accessed on the UI thread.
 class ExtensionTabIdMap::TabObserver : public NotificationObserver {
  public:
   TabObserver();
   ~TabObserver();
 
  private:
   // NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   NotificationRegistrar registrar_;
 };
 
 ExtensionTabIdMap::TabObserver::TabObserver() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::TAB_PARENTED,
+  registrar_.Add(this, content::NOTIFICATION_TAB_PARENTED,
                  NotificationService::AllSources());
 }
 
 ExtensionTabIdMap::TabObserver::~TabObserver() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void ExtensionTabIdMap::TabObserver::Observe(
-    NotificationType type, const NotificationSource& source,
+    int type, const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB: {
+  switch (type) {
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
       TabContents* contents = Source<TabContents>(source).ptr();
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(contents);
       if (!tab)
         break;
       RenderViewHost* host = Details<RenderViewHost>(details).ptr();
       // TODO(mpcmoplete): How can we tell if window_id is bogus? It may not
       // have been set yet.
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(
               ExtensionTabIdMap::GetInstance(),
               &ExtensionTabIdMap::SetTabAndWindowId,
               host->process()->id(), host->routing_id(),
               tab->restore_tab_helper()->session_id().id(),
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
-    case NotificationType::TAB_PARENTED: {
+    case content::NOTIFICATION_TAB_PARENTED: {
       TabContentsWrapper* tab = Source<TabContentsWrapper>(source).ptr();
       RenderViewHost* host = tab->render_view_host();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(
               ExtensionTabIdMap::GetInstance(),
               &ExtensionTabIdMap::SetTabAndWindowId,
               host->process()->id(), host->routing_id(),
               tab->restore_tab_helper()->session_id().id(),
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
-    case NotificationType::RENDER_VIEW_HOST_DELETED: {
+    case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {
       RenderViewHost* host = Source<RenderViewHost>(source).ptr();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(
               ExtensionTabIdMap::GetInstance(),
               &ExtensionTabIdMap::ClearTabAndWindowId,
               host->process()->id(), host->routing_id()));
       break;
     }
     default:
@@ skipping 44 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   RenderId render_id(render_process_host_id, routing_id);
   TabAndWindowIdMap::iterator iter = map_.find(render_id);
   if (iter != map_.end()) {
     *tab_id = iter->second.first;
     *window_id = iter->second.second;
     return true;
   }
   return false;
 }