summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/user_script_slave.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 18:13:27 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 18:13:27 +0000
commitea4d0790da2db4aae00e07af25feffd7e3857377 (patch)
tree44af49f6bd1432124069d2bba095ac49f9fc2af3 /chrome/renderer/user_script_slave.cc
parent76624fdeda4c8409a6bfd8a5f48de00dbceb0760 (diff)
downloadchromium_src-ea4d0790da2db4aae00e07af25feffd7e3857377.zip
chromium_src-ea4d0790da2db4aae00e07af25feffd7e3857377.tar.gz
chromium_src-ea4d0790da2db4aae00e07af25feffd7e3857377.tar.bz2
Implement chrome.extension.connectExternal and fix various API inconsistencies.
BUG=23583 BUG=17910 TEST=no Review URL: http://codereview.chromium.org/262016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/user_script_slave.cc')
-rw-r--r--chrome/renderer/user_script_slave.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc
index 86fcc1a..f3df33c 100644
--- a/chrome/renderer/user_script_slave.cc
+++ b/chrome/renderer/user_script_slave.cc
@@ -25,12 +25,8 @@ 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.
-// TODO(mpcomplete): self.onConnect is deprecated. Remove it at 1.0.
-// http://code.google.com/p/chromium/issues/detail?id=16356
-static const char kInitExtension[] =
- "chrome.extension = new chrome.Extension('%s');"
- "chrome.self.onConnect = chrome.extension.onConnect;";
+// Sets up the chrome.extension module.
+static const char kInitExtension[] = "chrome.initExtension('%s');";
int UserScriptSlave::GetIsolatedWorldId(const std::string& extension_id) {
typedef std::map<std::string, int> IsolatedWorldMap;