summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 17:02:36 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 17:02:36 +0000
commit6b6db57f06b8610f211d7fd8e5122447adf1fa71 (patch)
treef7b9adc85a242f59d8ebb50667035f0620694dcd /chrome/browser/renderer_host
parent283b6f77716b240ea352d0d52aa0613ce0a02a00 (diff)
downloadchromium_src-6b6db57f06b8610f211d7fd8e5122447adf1fa71.zip
chromium_src-6b6db57f06b8610f211d7fd8e5122447adf1fa71.tar.gz
chromium_src-6b6db57f06b8610f211d7fd8e5122447adf1fa71.tar.bz2
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
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 5849459..0f61b0f 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1676,7 +1676,8 @@ void RenderViewHost::OnRequestNotificationPermission(
const GURL& source_origin, int callback_context) {
DesktopNotificationService* service =
process()->profile()->GetDesktopNotificationService();
- service->RequestPermission(source_origin, callback_context);
+ service->RequestPermission(
+ source_origin, process()->id(), routing_id(), callback_context);
}
void RenderViewHost::OnExtensionRequest(const std::string& name,