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

chrome/browser/alternate_nav_url_fetcher.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/alternate_nav_url_fetcher.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 AlternateNavURLFetcher::AlternateNavURLFetcher(
     const GURL& alternate_nav_url)
     : LinkInfoBarDelegate(NULL),
       alternate_nav_url_(alternate_nav_url),
       controller_(NULL),
       state_(NOT_STARTED),
       navigated_to_entry_(false),
       infobar_contents_(NULL) {
-  registrar_.Add(this, NotificationType::NAV_ENTRY_PENDING,
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                  NotificationService::AllSources());
 }
 
 AlternateNavURLFetcher::~AlternateNavURLFetcher() {}
 
-void AlternateNavURLFetcher::Observe(NotificationType type,
+void AlternateNavURLFetcher::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::NAV_ENTRY_PENDING:
+  switch (type) {
+    case content::NOTIFICATION_NAV_ENTRY_PENDING:
       // If we've already received a notification for the same controller, we
       // should delete ourselves as that indicates that the page is being
       // re-loaded so this instance is now stale.
       // http://crbug.com/43378
       if (!infobar_contents_ &&
           controller_ == Source<NavigationController>(source).ptr()) {
         delete this;
       } else if (!controller_) {
         controller_ = Source<NavigationController>(source).ptr();
         DCHECK(controller_->pending_entry());
 
         // Start listening for the commit notification. We also need to listen
         // for the tab close command since that means the load will never
         // commit!
-        registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+        registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                        Source<NavigationController>(controller_));
-        registrar_.Add(this, NotificationType::TAB_CLOSED,
+        registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
                        Source<NavigationController>(controller_));
 
         DCHECK_EQ(NOT_STARTED, state_);
         state_ = IN_PROGRESS;
         fetcher_.reset(new URLFetcher(GURL(alternate_nav_url_),
                                       URLFetcher::HEAD, this));
         fetcher_->set_request_context(
             controller_->profile()->GetRequestContext());
         fetcher_->Start();
       }
       break;
 
-    case NotificationType::NAV_ENTRY_COMMITTED:
+    case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
       // The page was navigated, we can show the infobar now if necessary.
-      registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
+      registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                         Source<NavigationController>(controller_));
       navigated_to_entry_ = true;
       ShowInfobarIfPossible();
       break;
 
-    case NotificationType::TAB_CLOSED:
+    case content::NOTIFICATION_TAB_CLOSED:
       // We have been closed. In order to prevent the URLFetcher from trying to
       // access the controller that will be invalid, we delete ourselves.
       // This deletes the URLFetcher and insures its callback won't be called.
       delete this;
       break;
 
     default:
       NOTREACHED();
   }
 }
@@ skipping 73 matching lines @@
     if (state_ == FAILED)
       delete this;
     return;
   }
 
   infobar_contents_ = controller_->tab_contents();
   StoreActiveEntryUniqueID(infobar_contents_);
   TabContentsWrapper::GetCurrentWrapperForContents(infobar_contents_)->
       AddInfoBar(this);
 }