| Index: extensions/renderer/user_script_injector.cc
|
| diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
|
| index 6e4497f8f5799b0f85a418392a23c6f1db1b3c56..49f63b92c2d3c8a9670c120920b6113ab6811fc8 100644
|
| --- a/extensions/renderer/user_script_injector.cc
|
| +++ b/extensions/renderer/user_script_injector.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/lazy_instance.h"
|
| #include "content/public/common/url_constants.h"
|
| +#include "extensions/common/constants.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "extensions/renderer/script_context.h"
|
| @@ -87,6 +88,10 @@ void UserScriptInjector::OnUserScriptsUpdated(
|
| }
|
| }
|
|
|
| +extension_misc::InjectedScriptType UserScriptInjector::script_type() const {
|
| + return extension_misc::CONTENT_SCRIPT;
|
| +}
|
| +
|
| bool UserScriptInjector::ShouldExecuteInChildFrames() const {
|
| return false;
|
| }
|
| @@ -115,7 +120,7 @@ bool UserScriptInjector::ShouldInjectCss(
|
| !script_->css_scripts().empty();
|
| }
|
|
|
| -ScriptInjector::AccessType UserScriptInjector::CanExecuteOnFrame(
|
| +PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
|
| const Extension* extension,
|
| blink::WebFrame* web_frame,
|
| int tab_id,
|
| @@ -123,15 +128,18 @@ ScriptInjector::AccessType UserScriptInjector::CanExecuteOnFrame(
|
| // If we don't have a tab id, we have no UI surface to ask for user consent.
|
| // For now, we treat this as an automatic allow.
|
| if (tab_id == -1)
|
| - return ALLOW_ACCESS;
|
| + return PermissionsData::ACCESS_ALLOWED;
|
|
|
| GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
|
| web_frame, web_frame->document().url(), script_->match_about_blank());
|
|
|
| - return extension->permissions_data()->RequiresActionForScriptExecution(
|
| - extension, tab_id, web_frame->top()->document().url())
|
| - ? REQUEST_ACCESS
|
| - : ALLOW_ACCESS;
|
| + return extension->permissions_data()->GetContentScriptAccess(
|
| + extension,
|
| + effective_document_url,
|
| + top_url,
|
| + tab_id,
|
| + -1, // no process id
|
| + NULL /* ignore error */);
|
| }
|
|
|
| std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
|
|
|