From 6b6db57f06b8610f211d7fd8e5122447adf1fa71 Mon Sep 17 00:00:00 2001 From: "johnnyg@chromium.org" Date: Fri, 6 Nov 2009 17:02:36 +0000 Subject: Correctly route the notifications permission-request-complete callback to the process/route which generated it. It might not be the same tab that's showing the infobar, particularly if it comes from an extension. BUG=26859 TEST=request notifications permission from an extension and allow it. Review URL: http://codereview.chromium.org/378005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31239 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/notifications/desktop_notification_service.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'chrome/browser/notifications/desktop_notification_service.cc') diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 477b505..d170891 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -100,12 +100,14 @@ class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate { public: NotificationPermissionInfoBarDelegate(TabContents* contents, const GURL& origin, + int process_id, + int route_id, int callback_context) : ConfirmInfoBarDelegate(contents), origin_(origin), profile_(contents->profile()), - process_id_(contents->process()->id()), - route_id_(contents->render_view_host()->routing_id()), + process_id_(process_id), + route_id_(route_id), callback_context_(callback_context), action_taken_(false) { } @@ -247,7 +249,7 @@ void DesktopNotificationService::DenyPermission(const GURL& origin) { } void DesktopNotificationService::RequestPermission( - const GURL& origin, int callback_context) { + const GURL& origin, int process_id, int route_id, int callback_context) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); // Show an info bar requesting permission. Browser* browser = BrowserList::GetLastActive(); @@ -258,8 +260,8 @@ void DesktopNotificationService::RequestPermission( TabContents* tab = browser->GetSelectedTabContents(); if (!tab) return; - tab->AddInfoBar(new NotificationPermissionInfoBarDelegate(tab, origin, - callback_context)); + tab->AddInfoBar(new NotificationPermissionInfoBarDelegate( + tab, origin, process_id, route_id, callback_context)); } void DesktopNotificationService::ShowNotification( -- cgit v1.1