chrome/browser/geolocation/chrome_geolocation_permission_context.cc - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/first_run/first_run_win.cc ('k') | chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

===================================================================

--- chrome/browser/geolocation/chrome_geolocation_permission_context.cc (revision 91968)

+++ chrome/browser/geolocation/chrome_geolocation_permission_context.cc (working copy)

@@ -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 @@

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::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 @@

}

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(