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

chrome/browser/sync/glue/session_change_processor.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/sync/glue/session_change_processor.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 
 namespace browser_sync {
 
 SessionChangeProcessor::SessionChangeProcessor(
     UnrecoverableErrorHandler* error_handler,
@@ skipping 17 matching lines @@
       setup_for_test_(setup_for_test) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(error_handler);
   DCHECK(session_model_associator_);
 }
 
 SessionChangeProcessor::~SessionChangeProcessor() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-void SessionChangeProcessor::Observe(NotificationType type,
+void SessionChangeProcessor::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(running());
   DCHECK(profile_);
 
   // Track which windows and/or tabs are modified.
   std::vector<TabContentsWrapper*> modified_tabs;
   bool windows_changed = false;
-  switch (type.value) {
-    case NotificationType::BROWSER_OPENED: {
+  switch (type) {
+    case chrome::NOTIFICATION_BROWSER_OPENED: {
       Browser* browser = Source<Browser>(source).ptr();
       if (browser->profile() != profile_) {
         return;
       }
 
       windows_changed = true;
       break;
     }
 
-    case NotificationType::TAB_PARENTED: {
+    case content::NOTIFICATION_TAB_PARENTED: {
       TabContentsWrapper* tab = Source<TabContentsWrapper>(source).ptr();
       if (tab->profile() != profile_) {
         return;
       }
       windows_changed = true;
       modified_tabs.push_back(tab);
       break;
     }
 
-    case NotificationType::TAB_CLOSED: {
+    case content::NOTIFICATION_TAB_CLOSED: {
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(
               Source<NavigationController>(source).ptr()->tab_contents());
       if (!tab || tab->profile() != profile_) {
         return;
       }
       windows_changed = true;
       modified_tabs.push_back(tab);
       break;
     }
 
-    case NotificationType::NAV_LIST_PRUNED: {
+    case content::NOTIFICATION_NAV_LIST_PRUNED: {
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(
               Source<NavigationController>(source).ptr()->tab_contents());
       if (!tab || tab->profile() != profile_) {
         return;
       }
       modified_tabs.push_back(tab);
       break;
     }
 
-    case NotificationType::NAV_ENTRY_CHANGED: {
+    case content::NOTIFICATION_NAV_ENTRY_CHANGED: {
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(
               Source<NavigationController>(source).ptr()->tab_contents());
       if (!tab || tab->profile() != profile_) {
         return;
       }
       modified_tabs.push_back(tab);
       break;
     }
 
-    case NotificationType::NAV_ENTRY_COMMITTED: {
+    case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(
               Source<NavigationController>(source).ptr()->tab_contents());
       if (!tab || tab->profile() != profile_) {
         return;
       }
       modified_tabs.push_back(tab);
       break;
     }
 
-    case NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
+    case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
       ExtensionTabHelper* extension_tab_helper =
           Source<ExtensionTabHelper>(source).ptr();
       if (extension_tab_helper->tab_contents()->profile() != profile_) {
         return;
       }
       if (extension_tab_helper->extension_app()) {
         modified_tabs.push_back(extension_tab_helper->tab_contents_wrapper());
       }
       break;
     }
     default:
       LOG(ERROR) << "Received unexpected notification of type "
-                  << type.value;
+                  << type;
       break;
   }
 
   // Associate windows first to ensure tabs have homes.
   if (windows_changed)
     session_model_associator_->ReassociateWindows(false);
   if (!modified_tabs.empty())
     session_model_associator_->ReassociateTabs(modified_tabs);
 }
 
@@ skipping 57 matching lines @@
       LOG(WARNING) << "Dropping modification to local session.";
       return;
     }
     const int64 mtime = sync_node.GetModificationTime();
     // Model associator handles foreign session update and add the same.
     session_model_associator_->AssociateForeignSpecifics(specifics, mtime);
   }
 
   // Notify foreign session handlers that there are new sessions.
   NotificationService::current()->Notify(
-      NotificationType::FOREIGN_SESSION_UPDATED,
+      chrome::NOTIFICATION_FOREIGN_SESSION_UPDATED,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
   StartObserving();
 }
 
 void SessionChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   DCHECK(profile_ == NULL);
   profile_ = profile;
   StartObserving();
 }
 
 void SessionChangeProcessor::StopImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   StopObserving();
   profile_ = NULL;
 }
 
 void SessionChangeProcessor::StartObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
-  notification_registrar_.Add(this, NotificationType::TAB_PARENTED,
+  notification_registrar_.Add(this, content::NOTIFICATION_TAB_PARENTED,
       NotificationService::AllSources());
-  notification_registrar_.Add(this, NotificationType::TAB_CLOSED,
+  notification_registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
       NotificationService::AllSources());
-  notification_registrar_.Add(this, NotificationType::NAV_LIST_PRUNED,
+  notification_registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
       NotificationService::AllSources());
-  notification_registrar_.Add(this, NotificationType::NAV_ENTRY_CHANGED,
+  notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED,
       NotificationService::AllSources());
-  notification_registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+  notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       NotificationService::AllSources());
-  notification_registrar_.Add(this, NotificationType::BROWSER_OPENED,
+  notification_registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED,
       NotificationService::AllSources());
   notification_registrar_.Add(this,
-      NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
+      chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
       NotificationService::AllSources());
 }
 
 void SessionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync