summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 19:22:05 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 19:22:05 +0000
commit33b28a75192e79cff41ecbe82defd65ad5da9535 (patch)
treead5c5fde642d3220d74262ae594bf21658b3f1c3 /chrome
parent9c7c492f60ba2ce10a3207af55e3278aae1c973a (diff)
downloadchromium_src-33b28a75192e79cff41ecbe82defd65ad5da9535.zip
chromium_src-33b28a75192e79cff41ecbe82defd65ad5da9535.tar.gz
chromium_src-33b28a75192e79cff41ecbe82defd65ad5da9535.tar.bz2
Fix a NOTREACHED in RenderViewHost::OnExtensionRequest. It was firing because
RenderViewHosts created via window.open don't have their enabled_bindings_ set. Review URL: http://codereview.chromium.org/119134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-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 0c19b07..63ea4ae 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1436,7 +1436,8 @@ void RenderViewHost::OnExtensionRequest(const std::string& name,
const std::string& args,
int request_id,
bool has_callback) {
- if (!BindingsPolicy::is_extension_enabled(enabled_bindings_)) {
+ if (!ChildProcessSecurityPolicy::GetInstance()->
+ HasExtensionBindings(process()->pid())) {
NOTREACHED() << "Blocked unauthorized use of extension bindings.";
return;
}