diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 09:47:35 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 09:47:35 +0000 |
| commit | 912256b3517241047095dac6946de191029dda27 (patch) | |
| tree | 7799ca1544916d7e1f44b06bd0dd43e080b61996 /chrome/renderer/user_script_slave.h | |
| parent | 50c4e907cf41e395a5edecd1ae122b9a2b35410d (diff) | |
| download | chromium_src-912256b3517241047095dac6946de191029dda27.zip chromium_src-912256b3517241047095dac6946de191029dda27.tar.gz chromium_src-912256b3517241047095dac6946de191029dda27.tar.bz2 | |
Try again to land "Implement script API:executeScript"
http://codereview.chromium.org/173556
TBR=mpcomplete@chromium.org
Patch from Jerry Tang <tangjie@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/user_script_slave.h')
| -rw-r--r-- | chrome/renderer/user_script_slave.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index 614dd85..39407f1 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_ #include <map> +#include <string> #include <vector> #include "base/scoped_ptr.h" @@ -13,11 +14,14 @@ #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" +#include "webkit/api/public/WebScriptSource.h" namespace WebKit { class WebFrame; } +using WebKit::WebScriptSource; + // Manages installed UserScripts for a render process. class UserScriptSlave { public: @@ -31,6 +35,8 @@ class UserScriptSlave { // testability. bool InjectScripts(WebKit::WebFrame* frame, UserScript::RunLocation location); + static void InsertInitExtensionCode(std::vector<WebScriptSource>* sources, + const std::string& extension_id); private: // Shared memory containing raw script data. scoped_ptr<base::SharedMemory> shared_memory_; |