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

chrome/browser/sessions/session_restore.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/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
@@ skipping 139 matching lines @@
 
 void TabLoader::StartLoading() {
   registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DID_PAINT,
                  NotificationService::AllSources());
 #if defined(OS_CHROMEOS)
   if (chromeos::NetworkStateNotifier::is_connected()) {
     loading_ = true;
     LoadNextTab();
   } else {
     // Start listening to network state notification now.
-    registrar_.Add(this, NotificationType::NETWORK_STATE_CHANGED,
+    registrar_.Add(this, chrome::NETWORK_STATE_CHANGED,
                    NotificationService::AllSources());
   }
 #else
   loading_ = true;
   LoadNextTab();
 #endif
 }
 
 void TabLoader::LoadNextTab() {
   if (!tabs_to_load_.empty()) {
@@ skipping 26 matching lines @@
         base::TimeDelta::FromMilliseconds(force_load_delay_),
         this, &TabLoader::ForceLoadTimerFired);
   }
 }
 
 void TabLoader::Observe(NotificationType type,
                         const NotificationSource& source,
                         const NotificationDetails& details) {
   switch (type.value) {
 #if defined(OS_CHROMEOS)
-    case NotificationType::NETWORK_STATE_CHANGED: {
+    case chrome::NETWORK_STATE_CHANGED: {
       chromeos::NetworkStateDetails* state_details =
           Details<chromeos::NetworkStateDetails>(details).ptr();
       switch (state_details->state()) {
         case chromeos::NetworkStateDetails::CONNECTED:
           if (!loading_) {
             loading_ = true;
             LoadNextTab();
           }
           // Start loading
           break;
@@ skipping 194 matching lines @@
       bool old_state = MessageLoop::current()->NestableTasksAllowed();
       MessageLoop::current()->SetNestableTasksAllowed(true);
       MessageLoop::current()->Run();
       MessageLoop::current()->SetNestableTasksAllowed(old_state);
       Browser* browser = ProcessSessionWindows(&windows_);
       delete this;
       return browser;
     }
 
     if (browser_) {
-      registrar_.Add(this, NotificationType::BROWSER_CLOSED,
+      registrar_.Add(this, chrome::BROWSER_CLOSED,
                      Source<Browser>(browser_));
     }
 
     return browser_;
   }
 
   // Restore window(s) from a foreign session.
   void RestoreForeignSession(
       std::vector<SessionWindow*>::const_iterator begin,
       std::vector<SessionWindow*>::const_iterator end) {
@@ skipping 35 matching lines @@
   ~SessionRestoreImpl() {
     STLDeleteElements(&windows_);
     restoring = false;
     g_browser_process->ReleaseModule();
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     switch (type.value) {
-      case NotificationType::BROWSER_CLOSED:
+      case chrome::BROWSER_CLOSED:
         delete this;
         return;
 
       default:
         NOTREACHED();
         break;
     }
   }
 
  private:
@@ skipping 312 matching lines @@
   std::vector<GURL> gurls;
   SessionRestoreImpl restorer(profile,
       static_cast<Browser*>(NULL), true, false, true, gurls);
   restorer.RestoreForeignTab(tab);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }