Implement new page action API.

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.
 
 // This script contains privileged chrome extension related javascript APIs.
 // It is loaded by pages whose URL has the chrome-extension protocol.
 
 var chrome = chrome || {};
 (function() {
   native function GetExtensionAPIDefinition();
   native function StartRequest();
   native function GetCurrentPageActions(extensionId);
   native function GetExtensionViews();
   native function GetChromeHidden();
   native function GetNextRequestId();
   native function OpenChannelToTab();
   native function GetRenderViewId();
   native function GetL10nMessage();
-  native function SetBrowserActionIcon();
+  native function SetExtensionActionIcon();
 
   if (!chrome)
     chrome = {};
 
   var chromeHidden = GetChromeHidden();
 
   // Validate arguments.
   chromeHidden.validationTypes = [];
   chromeHidden.validate = function(args, schemas) {
     if (args.length > schemas.length)
@@ skipping 140 matching lines @@
     return StartRequest(functionName, sargs, requestId,
                         request.callback ? true : false);
   }
 
   // Send a special API request that is not JSON stringifiable, and optionally
   // register a callback.
   function sendCustomRequest(nativeFunction, functionName, args, argSchemas) {
     var request = prepareRequest(args, argSchemas);
     var requestId = GetNextRequestId();
     requests[requestId] = request;
-    return nativeFunction(functionName, args, requestId,
+    return nativeFunction(functionName, request.args, requestId,
                           request.callback ? true : false);
   }
 
   function bind(obj, func) {
     return function() {
       return func.apply(obj, arguments);
     };
   }
 
   // --- Setup additional api's not currently handled in common/extensions/api
@@ skipping 135 matching lines @@
         tabIdProxy[name] = new chrome.Event("devtools." + tabId + "." + name);
       });
       return tabIdProxy;
     }
 
     apiFunctions["i18n.getMessage"].handleRequest =
         function(message_name, placeholders) {
       return GetL10nMessage(message_name, placeholders);
     }
 
-    apiFunctions["browserAction.setIcon"].handleRequest = function(details) {
+    function setIconCommon(details, name, parameters) {
       if ("iconIndex" in details) {
-        sendRequest(this.name, arguments, this.definition.parameters);
+        sendRequest(name, [details], parameters);
       } else if ("imageData" in details) {
         // Verify that this at least looks like an ImageData element.
         // Unfortunately, we cannot use instanceof because the ImageData
         // constructor is not public.
         //
         // We do this manually instead of using JSONSchema to avoid having these
         // properties show up in the doc.
         if (!("width" in details.imageData) ||
             !("height" in details.imageData) ||
             !("data" in details.imageData)) {
           throw new Error(
               "The imageData property must contain an ImageData object.");
         }
-
-        sendCustomRequest(SetBrowserActionIcon, "browserAction.setIcon",
-                          details, this.definition.parameters);
+        sendCustomRequest(SetExtensionActionIcon, name, [details], parameters);
       } else {
         throw new Error(
             "Either the iconIndex or imageData property must be specified.");
       }
     }
 
+    apiFunctions["browserAction.setIcon"].handleRequest = function(details) {
+      setIconCommon(details, this.name, this.definition.parameters);
+    };
+
+    apiFunctions["pageAction.setIcon"].handleRequest = function(details) {
+      setIconCommon(details, this.name, this.definition.parameters);
+    };
+
     setupBrowserActionEvent(extensionId);
     setupPageActionEvents(extensionId);
     setupToolstripEvents(GetRenderViewId());
   });
 })();