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/extensions/api/tabs/tabs_api.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/extensions/api/tabs/tabs_api.cc')
| -rw-r--r-- | chrome/browser/extensions/api/tabs/tabs_api.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 4816da7..229d89a 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -75,6 +75,7 @@ #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" +#include "extensions/common/host_id.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/default_locale_handler.h" #include "extensions/common/message_bundle.h" @@ -1241,7 +1242,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string, } TabHelper::FromWebContents(web_contents_)->script_executor()->ExecuteScript( - extension_id(), + HostID(HostID::EXTENSIONS, extension_id()), ScriptExecutor::JAVASCRIPT, url.GetContent(), ScriptExecutor::TOP_FRAME, @@ -1731,6 +1732,7 @@ bool ExecuteCodeInTabFunction::Init() { execute_tab_id_ = tab_id; details_ = details.Pass(); + set_host_id(HostID(HostID::EXTENSIONS, extension()->id())); return true; } |