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

chrome/browser/geolocation/chrome_geolocation_permission_context.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/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/geolocation/geolocation_provider.h"
 #include "content/browser/renderer_host/render_process_host.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // GeolocationInfoBarQueueController ------------------------------------------
 
@@ skipping 35 matching lines @@
   // It'll notify and dismiss any other pending InfoBar request for the same
   // |requesting_frame| and embedder.
   void OnPermissionSet(int render_process_id,
                        int render_view_id,
                        int bridge_id,
                        const GURL& requesting_frame,
                        const GURL& embedder,
                        bool allowed);
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   struct PendingInfoBarRequest;
   class RequestEquals;
 
   typedef std::vector<PendingInfoBarRequest> PendingInfoBarRequests;
 
   // Shows the first pending infobar for this tab.
@@ skipping 316 matching lines @@
       geolocation_permission_context_->NotifyPermissionSet(
           copied_request.render_process_id, copied_request.render_view_id,
           copied_request.bridge_id, copied_request.requesting_frame, allowed);
     } else {
       ++i;
     }
   }
 }
 
 void GeolocationInfoBarQueueController::Observe(
-    NotificationType type, const NotificationSource& source,
+    int type, const NotificationSource& source,
     const NotificationDetails& details) {
-  registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
+  registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                     source);
   TabContents* tab_contents = Source<TabContents>(source).ptr();
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end();) {
     if (i->infobar_delegate == NULL &&
         tab_contents == tab_util::GetTabContentsByID(i->render_process_id,
                                                      i->render_view_id)) {
       i = pending_infobar_requests_.erase(i);
     } else {
       ++i;
@@ skipping 10 matching lines @@
     wrapper = TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ) {
     if (i->IsForTab(render_process_id, render_view_id)) {
       if (!wrapper) {
         i = pending_infobar_requests_.erase(i);
         continue;
       }
 
       if (!i->infobar_delegate) {
-        if (!registrar_.IsRegistered(this,
-                                     NotificationType::TAB_CONTENTS_DESTROYED,
-                                     Source<TabContents>(tab_contents))) {
-          registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
+        if (!registrar_.IsRegistered(
+                this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
+                Source<TabContents>(tab_contents))) {
+          registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                          Source<TabContents>(tab_contents));
         }
         i->infobar_delegate = new GeolocationConfirmInfoBarDelegate(
             tab_contents, this, render_process_id, render_view_id, i->bridge_id,
             i->requesting_frame,
             profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
         wrapper->AddInfoBar(i->infobar_delegate);
       }
       break;
     }
@@ skipping 147 matching lines @@
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
         this, &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
         render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
       render_view_id, bridge_id);
 }