Extension cleanup: move devtools custom bindings out of schema_generated_bindings.js

BUG=80310
TEST=browser_tests (win, mac, linux)


Review URL: http://codereview.chromium.org/9212029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118019 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 31 insertions, 12 deletions

diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 0f38ea0..c3f1f32 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -126,6 +126,7 @@
         'renderer/resources/extensions/browser_action_custom_bindings.js',
         'renderer/resources/extensions/chrome_private_custom_bindings.js',
         'renderer/resources/extensions/context_menus_custom_bindings.js',
+        'renderer/resources/extensions/devtools_custom_bindings.js',
         'renderer/resources/extensions/event.js',
         'renderer/resources/extensions/experimental.input.ime_custom_bindings.js',
         'renderer/resources/extensions/experimental.socket_custom_bindings.js',
diff --git a/chrome/renderer/extensions/custom_bindings_util.cc b/chrome/renderer/extensions/custom_bindings_util.cc
index 99dc0a7..b4ff5a5 100644
--- a/chrome/renderer/extensions/custom_bindings_util.cc
+++ b/chrome/renderer/extensions/custom_bindings_util.cc
@@ -33,6 +33,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) {
   // Must match kResourceIDs.
   static const char* kJavascriptFiles[] = {
     "extensions/browser_action_custom_bindings.js",
+    "extensions/devtools_custom_bindings.js",
     "extensions/experimental.input.ime_custom_bindings.js",
     "extensions/omnibox_custom_bindings.js",
     "extensions/page_action_custom_bindings.js",
@@ -44,6 +45,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) {
   // Must match kJavascriptFiles.
   static const int kResourceIDs[] = {
     IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS,
+    IDR_DEVTOOLS_CUSTOM_BINDINGS_JS,
     IDR_EXPERIMENTAL_INPUT_IME_CUSTOM_BINDINGS_JS,
     IDR_OMNIBOX_CUSTOM_BINDINGS_JS,
     IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS,
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index 73733ce..20d99b9 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -31,6 +31,7 @@ without changes to the corresponding grd file. fb9 -->
       <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\browser_action_custom_bindings.js" type="BINDATA" />
       <include name="IDR_CHROME_PRIVATE_CUSTOM_BINDINGS_JS" file="resources\extensions\chrome_private_custom_bindings.js" type="BINDATA" />
       <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="resources\extensions\context_menus_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_DEVTOOLS_CUSTOM_BINDINGS_JS" file="resources\extensions\devtools_custom_bindings.js" type="BINDATA" />
       <include name="IDR_EXPERIMENTAL_INPUT_IME_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.input.ime_custom_bindings.js" type="BINDATA" />
       <include name="IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.socket_custom_bindings.js" type="BINDATA" />
       <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" />
diff --git a/chrome/renderer/resources/extensions/devtools_custom_bindings.js b/chrome/renderer/resources/extensions/devtools_custom_bindings.js
new file mode 100644
index 0000000..a0e0a3f
--- /dev/null
+++ b/chrome/renderer/resources/extensions/devtools_custom_bindings.js
@@ -0,0 +1,27 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Custom bindings for the devtools API.
+
+(function() {
+
+native function GetChromeHidden();
+
+GetChromeHidden().registerCustomHook('devtools', function(bindingsAPI) {
+  var apiFunctions = bindingsAPI.apiFunctions;
+
+  apiFunctions.setHandleRequest('devtools.getTabEvents', function(tabId) {
+    var tabIdProxy = {};
+    var functions = ['onPageEvent', 'onTabClose'];
+    functions.forEach(function(name) {
+      // Event disambiguation is handled by name munging.  See
+      // chrome/browser/extensions/extension_devtools_events.h for the C++
+      // equivalent of this logic.
+      tabIdProxy[name] = new chrome.Event('devtools.' + tabId + '.' + name);
+    });
+    return tabIdProxy;
+  });
+});
+
+})();
diff --git a/chrome/renderer/resources/extensions/schema_generated_bindings.js b/chrome/renderer/resources/extensions/schema_generated_bindings.js
index e79d47c..ae7ab64 100644
--- a/chrome/renderer/resources/extensions/schema_generated_bindings.js
+++ b/chrome/renderer/resources/extensions/schema_generated_bindings.js
@@ -658,18 +658,6 @@ var chrome = chrome || {};
           chrome.webstorePrivate.beginInstallWithManifest3;
     }
 
-    apiFunctions.setHandleRequest("devtools.getTabEvents", function(tabId) {
-      var tabIdProxy = {};
-      var functions = ["onPageEvent", "onTabClose"];
-      functions.forEach(function(name) {
-        // Event disambiguation is handled by name munging.  See
-        // chrome/browser/extensions/extension_devtools_events.h for the C++
-        // equivalent of this logic.
-        tabIdProxy[name] = new chrome.Event("devtools." + tabId + "." + name);
-      });
-      return tabIdProxy;
-    });
-
     if (apiExists("test"))
       chrome.test.getApiDefinitions = GetExtensionAPIDefinition;
   });