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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/renderer/user_script_injector.h

Issue 348313003: Create withheld permissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test fix Created 6 years, 6 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
« extensions/renderer/script_injection.cc ('K') | « extensions/renderer/script_injector.h ('k') | extensions/renderer/user_script_injector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/user_script_injector.h
diff --git a/extensions/renderer/user_script_injector.h b/extensions/renderer/user_script_injector.h
index 6dd586ee16b682becb5a64967cb0800c6cc0bd33..34c744355fc1a1c2702c58f31eb7462aba99f631 100644
--- a/extensions/renderer/user_script_injector.h
+++ b/extensions/renderer/user_script_injector.h
@@ -35,6 +35,7 @@ class UserScriptInjector : public ScriptInjector,
const std::vector<UserScript*>& scripts) OVERRIDE;
// ScriptInjector implementation.
+ virtual extension_misc::InjectedScriptType script_type() const OVERRIDE;
virtual bool ShouldExecuteInChildFrames() const OVERRIDE;
virtual bool ShouldExecuteInMainWorld() const OVERRIDE;
virtual bool IsUserGesture() const OVERRIDE;
@@ -43,10 +44,11 @@ class UserScriptInjector : public ScriptInjector,
UserScript::RunLocation run_location) const OVERRIDE;
virtual bool ShouldInjectCss(
UserScript::RunLocation run_location) const OVERRIDE;
- virtual AccessType CanExecuteOnFrame(const Extension* extension,
- blink::WebFrame* web_frame,
- int tab_id,
- const GURL& top_url) const OVERRIDE;
+ virtual PermissionsData::AccessType CanExecuteOnFrame(
+ const Extension* extension,
+ blink::WebFrame* web_frame,
+ int tab_id,
+ const GURL& top_url) const OVERRIDE;
virtual std::vector<blink::WebScriptSource> GetJsSources(
UserScript::RunLocation run_location) const OVERRIDE;
virtual std::vector<std::string> GetCssSources(
« extensions/renderer/script_injection.cc ('K') | « extensions/renderer/script_injector.h ('k') | extensions/renderer/user_script_injector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698