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

Side by Side Diff: extensions/renderer/user_script_injector.cc

Issue 906493004: Refactoring: de-couple Extensions from "script injection System" [render side]:2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decouple_brower_isolated_world_1
Patch Set: Rebase. Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/user_script_injector.h" 5 #include "extensions/renderer/user_script_injector.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
11 #include "content/public/renderer/render_view.h"
11 #include "extensions/common/extension.h" 12 #include "extensions/common/extension.h"
12 #include "extensions/common/permissions/permissions_data.h" 13 #include "extensions/common/permissions/permissions_data.h"
13 #include "extensions/renderer/script_context.h" 14 #include "extensions/renderer/script_context.h"
14 #include "extensions/renderer/scripts_run_info.h" 15 #include "extensions/renderer/scripts_run_info.h"
15 #include "grit/extensions_renderer_resources.h" 16 #include "grit/extensions_renderer_resources.h"
16 #include "third_party/WebKit/public/web/WebDocument.h" 17 #include "third_party/WebKit/public/web/WebDocument.h"
17 #include "third_party/WebKit/public/web/WebFrame.h" 18 #include "third_party/WebKit/public/web/WebFrame.h"
18 #include "third_party/WebKit/public/web/WebScriptSource.h" 19 #include "third_party/WebKit/public/web/WebScriptSource.h"
19 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
20 #include "url/gurl.h" 21 #include "url/gurl.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame( 125 PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
125 const InjectionHost* injection_host, 126 const InjectionHost* injection_host,
126 blink::WebFrame* web_frame, 127 blink::WebFrame* web_frame,
127 int tab_id, 128 int tab_id,
128 const GURL& top_url) const { 129 const GURL& top_url) const {
129 // If we don't have a tab id, we have no UI surface to ask for user consent. 130 // If we don't have a tab id, we have no UI surface to ask for user consent.
130 // For now, we treat this as an automatic allow. 131 // For now, we treat this as an automatic allow.
131 if (tab_id == -1) 132 if (tab_id == -1)
132 return PermissionsData::ACCESS_ALLOWED; 133 return PermissionsData::ACCESS_ALLOWED;
133 134
135 int routing_id = content::RenderView::FromWebView(web_frame->top()->view())
136 ->GetRoutingID();
137 if (script_->routing_info().render_view_id == routing_id &&
138 script_->consumer_instance_info().type() == ConsumerInstanceInfo::WEBVIEW)
139 return PermissionsData::ACCESS_ALLOWED;
140
134 GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL( 141 GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
135 web_frame, web_frame->document().url(), script_->match_about_blank()); 142 web_frame, web_frame->document().url(), script_->match_about_blank());
136 return injection_host->CanExecuteOnFrame( 143 return injection_host->CanExecuteOnFrame(
137 effective_document_url, top_url, tab_id, is_declarative_); 144 effective_document_url, top_url, tab_id, is_declarative_);
138 } 145 }
139 146
140 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources( 147 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
141 UserScript::RunLocation run_location) const { 148 UserScript::RunLocation run_location) const {
142 DCHECK_EQ(script_->run_location(), run_location); 149 DCHECK_EQ(script_->run_location(), run_location);
143 150
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 } 208 }
202 209
203 if (ShouldInjectCss(run_location)) 210 if (ShouldInjectCss(run_location))
204 scripts_run_info->num_css += script_->css_scripts().size(); 211 scripts_run_info->num_css += script_->css_scripts().size();
205 } 212 }
206 213
207 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason) { 214 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason) {
208 } 215 }
209 216
210 } // namespace extensions 217 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698