diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-06-08 12:47:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-08 19:47:56 +0000 |
| commit | 45dca7ffee16d55049c08d352bdc7642144c987d (patch) | |
| tree | cf8a3632ed2b05b79a306068ad44a6f8e5980e39 /extensions/renderer/script_injection_manager.cc | |
| parent | dccced5e65659cf773b421882006a05aee17f5f6 (diff) | |
| download | chromium_src-45dca7ffee16d55049c08d352bdc7642144c987d.zip chromium_src-45dca7ffee16d55049c08d352bdc7642144c987d.tar.gz chromium_src-45dca7ffee16d55049c08d352bdc7642144c987d.tar.bz2 | |
[Extensions OOPI] Clean up script injection for OOPI more
Instead of using RenderView, use RenderFrame for sending IPC messages.
Use blink::WebLocalFrame instead of blink::WebFrame.
Cleanup unnecessary frame checks.
BUG=455776
Review URL: https://codereview.chromium.org/1157863011
Cr-Commit-Position: refs/heads/master@{#333321}
Diffstat (limited to 'extensions/renderer/script_injection_manager.cc')
| -rw-r--r-- | extensions/renderer/script_injection_manager.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc index 43e296c..326452b 100644 --- a/extensions/renderer/script_injection_manager.cc +++ b/extensions/renderer/script_injection_manager.cc @@ -11,7 +11,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_thread.h" -#include "content/public/renderer/render_view.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "extensions/common/extension_set.h" @@ -186,10 +185,10 @@ void ScriptInjectionManager::RFOHelper::OnExecuteDeclarativeScript( const ExtensionId& extension_id, int script_id, const GURL& url) { - // TODO(markdittmer): This would be cleaner if we compared page_ids instead. + // TODO(markdittmer): URL-checking isn't the best security measure. // Begin script injection workflow only if the current URL is identical to // the one that matched declarative conditions in the browser. - if (render_frame()->GetWebFrame()->top()->document().url() == url) { + if (render_frame()->GetWebFrame()->document().url() == url) { manager_->HandleExecuteDeclarativeScript(render_frame(), tab_id, extension_id, |