diff options
| author | hanxi <hanxi@chromium.org> | 2015-03-09 13:46:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 20:47:49 +0000 |
| commit | 79f7a57302cae3f7afcd53c6dff542e32bada999 (patch) | |
| tree | ffa0c8be372fff6f9c02f7a83e05928cb6472c65 /chrome/browser/chromeos/accessibility/accessibility_manager.cc | |
| parent | 7b41c6561705c1645d65313d116f35c582bd6247 (diff) | |
| download | chromium_src-79f7a57302cae3f7afcd53c6dff542e32bada999.zip chromium_src-79f7a57302cae3f7afcd53c6dff542e32bada999.tar.gz chromium_src-79f7a57302cae3f7afcd53c6dff542e32bada999.tar.bz2 | |
Enable <webview>.executeScript outside of Apps and Extensions [1]
This patch enables javascript code injection like <webview>.executeScript({code: ...}), but does not include file injection like <webview>.executeScript({file: ...}). File injection will be in another patch.
BUG=434081
Review URL: https://codereview.chromium.org/942533003
Cr-Commit-Position: refs/heads/master@{#319727}
Diffstat (limited to 'chrome/browser/chromeos/accessibility/accessibility_manager.cc')
| -rw-r--r-- | chrome/browser/chromeos/accessibility/accessibility_manager.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 2fcc539..338a86e 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc @@ -62,6 +62,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/host_id.h" #include "media/audio/sounds/sounds_manager.h" #include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/resource/resource_bundle.h" @@ -135,7 +136,7 @@ class ContentScriptLoader { if (success) { ExtensionMsg_ExecuteCode_Params params; params.request_id = 0; - params.extension_id = extension_id_; + params.host_id = HostID(HostID::EXTENSIONS, extension_id_); params.is_javascript = true; params.code = data; params.run_at = extensions::UserScript::DOCUMENT_IDLE; @@ -204,7 +205,7 @@ void InjectChromeVoxContentScript( // so that it won't interrupt our speech feedback enabled message. ExtensionMsg_ExecuteCode_Params params; params.request_id = 0; - params.extension_id = extension->id(); + params.host_id = HostID(HostID::EXTENSIONS, extension->id()); params.is_javascript = true; params.code = "window.INJECTED_AFTER_LOAD = true;"; params.run_at = extensions::UserScript::DOCUMENT_IDLE; |