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

Unified Diff: extensions/renderer/script_injection.h

Issue 594043002: Change ScriptInjection to work with WebLocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | extensions/renderer/script_injection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/script_injection.h
diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h
index 42ecdbd9493f4d7759bf491db77062c86c17fd48..d7edd666165ec3d3ed1c21f12557287748c20899 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -11,7 +11,7 @@
#include "extensions/renderer/script_injector.h"
namespace blink {
-class WebFrame;
+class WebLocalFrame;
}
namespace extensions {
@@ -29,7 +29,7 @@ class ScriptInjection {
static void RemoveIsolatedWorld(const std::string& extension_id);
ScriptInjection(scoped_ptr<ScriptInjector> injector,
- blink::WebFrame* web_frame,
+ blink::WebLocalFrame* web_frame,
const std::string& extension_id,
UserScript::RunLocation run_location,
int tab_id);
@@ -50,7 +50,7 @@ class ScriptInjection {
ScriptsRunInfo* scripts_run_info);
// Accessors.
- blink::WebFrame* web_frame() const { return web_frame_; }
+ blink::WebLocalFrame* web_frame() const { return web_frame_; }
const std::string& extension_id() const { return extension_id_; }
int64 request_id() const { return request_id_; }
@@ -64,11 +64,11 @@ class ScriptInjection {
// Inject any JS scripts into the |frame|, optionally populating
// |execution_results|.
void InjectJs(const Extension* extension,
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
base::ListValue* execution_results);
// Inject any CSS source into the |frame|.
- void InjectCss(blink::WebFrame* frame);
+ void InjectCss(blink::WebLocalFrame* frame);
// Notify that we will not inject, and mark it as acknowledged.
void NotifyWillNotInject(ScriptInjector::InjectFailureReason reason);
@@ -77,7 +77,7 @@ class ScriptInjection {
scoped_ptr<ScriptInjector> injector_;
// The (main) WebFrame into which this should inject the script.
- blink::WebFrame* web_frame_;
+ blink::WebLocalFrame* web_frame_;
// The id of the associated extension.
std::string extension_id_;
« no previous file with comments | « no previous file | extensions/renderer/script_injection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698