Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: extensions/renderer/user_script_injector.cc

Issue 1150683007: [Extensions] Use document url (not top url) for tab-specific permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix extension page content scripts Created 5 years, 7 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
Index: extensions/renderer/user_script_injector.cc
diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
index 53e1263297dd410572ff9aa6808521b28d6864f3..43bfa731c4991b10cab33334d956ddf56fa2b3f6 100644
--- a/extensions/renderer/user_script_injector.cc
+++ b/extensions/renderer/user_script_injector.cc
@@ -152,12 +152,11 @@ bool UserScriptInjector::ShouldInjectCss(
PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
const InjectionHost* injection_host,
blink::WebFrame* web_frame,
- int tab_id,
- const GURL& top_url) const {
+ int tab_id) const {
GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
web_frame, web_frame->document().url(), script_->match_about_blank());
PermissionsData::AccessType can_execute = injection_host->CanExecuteOnFrame(
- effective_document_url, top_url, tab_id, is_declarative_);
+ effective_document_url, web_frame, tab_id, is_declarative_);
if (script_->consumer_instance_type() !=
UserScript::ConsumerInstanceType::WEBVIEW ||
can_execute == PermissionsData::ACCESS_DENIED)

Powered by Google App Engine
This is Rietveld 408576698