diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
| commit | 43211582b1fa8c69136385250e7b0446cf364b5c (patch) | |
| tree | 655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/geolocation/chrome_geolocation_permission_context.cc | |
| parent | d43970a7ceee5fc5433787b0f28b64234a4039f2 (diff) | |
| download | chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.zip chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.gz chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.bz2 | |
Moving notification types which are chrome specific to a new header file chrome_notification_types.h.
This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h
BUG=76698
Review URL: http://codereview.chromium.org/7327007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/chrome_geolocation_permission_context.cc')
| -rw-r--r-- | chrome/browser/geolocation/chrome_geolocation_permission_context.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 3a557bb..c2db97f 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -23,9 +23,9 @@ #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" @@ -81,7 +81,7 @@ class GeolocationInfoBarQueueController : NotificationObserver { bool allowed); // NotificationObserver - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); @@ -418,9 +418,9 @@ void GeolocationInfoBarQueueController::OnPermissionSet( } 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(); @@ -451,10 +451,10 @@ void GeolocationInfoBarQueueController::ShowQueuedInfoBar(int render_process_id, } 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( |