Refactor extension bindings to share code, avoid exposing hidden variables

chrome/renderer/resources/extension_process_bindings.js

 // Copyright (c) 2009 The chrome Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // -----------------------------------------------------------------------------
 // NOTE: If you change this file you need to touch renderer_resources.grd to
 // have your change take effect.
 // -----------------------------------------------------------------------------
 
 var chrome;
 (function() {
-  native function GetNextRequestId();
-  native function RegisterExtension();
-  native function UnregisterExtension();
   native function GetViews();
   native function GetWindow();
   native function GetCurrentWindow();
   native function GetLastFocusedWindow();
   native function CreateWindow();
   native function UpdateWindow();
   native function RemoveWindow();
   native function GetAllWindows();
   native function GetTab();
   native function GetSelectedTab();
   native function GetAllTabsInWindow();
   native function CreateTab();
   native function UpdateTab();
   native function MoveTab();
   native function RemoveTab();
   native function EnablePageAction();
   native function DisablePageAction();
   native function GetBookmarks();
   native function GetBookmarkChildren();
   native function GetBookmarkTree();
   native function SearchBookmarks();
   native function RemoveBookmark();
   native function CreateBookmark();
   native function MoveBookmark();
   native function SetBookmarkTitle();
+  native function GetChromeHidden();
 
   if (!chrome)
     chrome = {};
 
+  var chromeHidden = GetChromeHidden();
+
   // Validate arguments.
   function validate(args, schemas) {
     if (args.length > schemas.length)
       throw new Error("Too many arguments.");
 
     for (var i = 0; i < schemas.length; i++) {
       if (i in args && args[i] !== null && args[i] !== undefined) {
         var validator = new chrome.JSONSchemaValidator();
         validator.validate(args[i], schemas[i]);
         if (validator.errors.length == 0)
@@ skipping 11 matching lines @@
         message = message.substring(0, message.length - 2);
         message += ".";
 
         throw new Error(message);
       } else if (!schemas[i].optional) {
         throw new Error("Parameter " + i + " is required.");
       }
     }
   }
 
-  // Callback handling.
-  // TODO(aa): This function should not be publicly exposed. Pass it into V8
-  // instead and hold one per-context. See the way event_bindings.js works.
-  var callbacks = [];
-  chrome.handleResponse_ = function(requestId, name, success, response, error) {
-    try {
-      if (!success) {
-        if (!error)
-          error = "Unknown error."
-        console.error("Error during " + name + ": " + error);
-        return;
-      }
-
-      if (callbacks[requestId]) {
-        if (response) {
-          callbacks[requestId](JSON.parse(response));
-        } else {
-          callbacks[requestId]();
-        }
-      }
-    } finally {
-      delete callbacks[requestId];
-    }
-  };
-
-  // Send an API request and optionally register a callback.
-  function sendRequest(request, args, callback) {
-    // JSON.stringify doesn't support a root object which is undefined.
-    if (args === undefined)
-      args = null;
-    var sargs = JSON.stringify(args);
-    var requestId = GetNextRequestId();
-    var hasCallback = false;
-    if (callback) {
-      hasCallback = true;
-      callbacks[requestId] = callback;
-    }
-    request(sargs, requestId, hasCallback);
-  }
+  var sendRequest = chromeHidden.sendRequest;
 
   //----------------------------------------------------------------------------
 
   // Windows.
   chrome.windows = {};
 
   chrome.windows.get = function(windowId, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetWindow, windowId, callback);
   };
@@ skipping 397 matching lines @@
   chrome.bookmarks.onChildrenReordered =
       new chrome.Event("bookmark-children-reordered");
 
 
   //----------------------------------------------------------------------------
 
   // Self.
   chrome.self = chrome.self || {};
   chrome.self.onConnect = new chrome.Event("channel-connect");
 
-  // Register
-  chrome.self.register_ = function() {
-    var extensionId = RegisterExtension();
-    window.addEventListener('unload', function() {
-        UnregisterExtension(extensionId); }, false);
-    delete chrome.self.register_;
-  }
-
   chrome.self.getViews = function() {
     return GetViews();
   }
 })();
-