diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 21:48:10 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-15 21:48:10 +0000 |
| commit | 51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1 (patch) | |
| tree | e93e38c0c421e627c711b59486654c0743a3184f /chrome/renderer/user_script_slave.cc | |
| parent | 5f86281ede483c8ba68d80055e48c3fd718ed5ca (diff) | |
| download | chromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.zip chromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.tar.gz chromium_src-51bcfbee3c3bd6509e3a8123db739d2f5b09fcd1.tar.bz2 | |
TBR: Revert "Miscellaneous API sprucing."
This reverts commit 052b8f424d1550deebf3dc562d7c47dde72d7f76.
Review URL: http://codereview.chromium.org/78001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/user_script_slave.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 651e9ad..bd5a988 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -25,9 +25,7 @@ using WebKit::WebString; static const char kUserScriptHead[] = "(function (unsafeWindow) {\n"; static const char kUserScriptTail[] = "\n})(window);"; -// Creates a convenient reference to a content script's parent extension. -static const char kInitExtension[] = - "chromium.extension = new chromium.Extension('%s')"; +static const char kInitSelf[] = "chromium.self = new chromium.Extension('%s')"; UserScriptSlave::UserScriptSlave() : shared_memory_(NULL), @@ -155,7 +153,7 @@ bool UserScriptSlave::InjectScripts(WebFrame* frame, // ID. sources.insert(sources.begin(), WebScriptSource(WebString::fromUTF8( - StringPrintf(kInitExtension, script->extension_id().c_str())))); + StringPrintf(kInitSelf, script->extension_id().c_str())))); } frame->ExecuteScriptInNewContext(&sources.front(), sources.size()); |