Adding the ability to remove page actions.BUG=NoneTEST=unit test.

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

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

3 files changed, 47 insertions, 24 deletions

diff --git a/chrome/renderer/extensions/extension_api_client_unittest.cc b/chrome/renderer/extensions/extension_api_client_unittest.cc
index ed2cf0b..dc37c5f 100644
--- a/chrome/renderer/extensions/extension_api_client_unittest.cc
+++ b/chrome/renderer/extensions/extension_api_client_unittest.cc
@@ -88,7 +88,7 @@ TEST_F(ExtensionAPIClientTest, CallbackDispatching) {
   ViewHostMsg_ExtensionRequest::Param params;
   ViewHostMsg_ExtensionRequest::Read(request_msg, &params);
   int callback_id = params.c;
-  ASSERT_TRUE(callback_id >= 0);
+  ASSERT_GE(callback_id, 0);
 
   // Now send the callback a response
   ExtensionProcessBindings::HandleResponse(
@@ -485,4 +485,9 @@ TEST_F(ExtensionAPIClientTest, EnablePageAction) {
                "\"dummy\", {tabId: 0, url: \"http://foo/\"});",
                "EnablePageAction",
                "[\"dummy\",{\"tabId\":0,\"url\":\"http://foo/\"}]");
+
+  ExpectJsPass("chrome.pageActions.disableForTab("
+               "\"dummy\", {tabId: 0, url: \"http://foo/\"});",
+               "DisablePageAction",
+               "[\"dummy\",{\"tabId\":0,\"url\":\"http://foo/\"}]");
 }
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index c59e98c..ab04582 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file.  -->
+without changes to the corresponding grd file. 0 -->
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/renderer_resources.h" type="rc_header">
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index ea6481c..472d9f7 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -28,6 +28,7 @@ var chrome;
   native function MoveTab();
   native function RemoveTab();
   native function EnablePageAction();
+  native function DisablePageAction();
   native function GetBookmarks();
   native function GetBookmarkChildren();
   native function GetBookmarkTree();
@@ -51,7 +52,7 @@ var chrome;
         validator.validate(args[i], schemas[i]);
         if (validator.errors.length == 0)
           continue;
-        
+
         var message = "Invalid value for argument " + i + ". ";
         for (var i = 0, err; err = validator.errors[i]; i++) {
           if (err.path) {
@@ -83,7 +84,7 @@ var chrome;
         console.error("Error during " + name + ": " + error);
         return;
       }
-      
+
       if (callbacks[requestId]) {
         if (response) {
           callbacks[requestId](JSON.parse(response));
@@ -125,7 +126,7 @@ var chrome;
     chrome.types.pInt,
     chrome.types.fun
   ];
-  
+
   chrome.windows.getCurrent = function(callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetCurrentWindow, null, callback);
@@ -134,7 +135,7 @@ var chrome;
   chrome.windows.getCurrent.params = [
     chrome.types.fun
   ];
-  
+
   chrome.windows.getLastFocused = function(callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetLastFocusedWindow, null, callback);
@@ -153,7 +154,7 @@ var chrome;
     chrome.types.optBool,
     chrome.types.fun
   ];
-  
+
   chrome.windows.create = function(createData, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(CreateWindow, createData, callback);
@@ -200,7 +201,7 @@ var chrome;
     chrome.types.pInt,
     chrome.types.optFun
   ];
-  
+
   // sends (windowId).
   // *WILL* be followed by tab-attached AND then tab-selection-changed.
   chrome.windows.onCreated = new chrome.Event("window-created");
@@ -210,7 +211,7 @@ var chrome;
   // tab-selection-changed -- one for each tab that was contained in the window
   // that closed
   chrome.windows.onRemoved = new chrome.Event("window-removed");
-  
+
   // sends (windowId).
   chrome.windows.onFocusChanged =
         new chrome.Event("window-focus-changed");
@@ -229,7 +230,7 @@ var chrome;
     chrome.types.pInt,
     chrome.types.fun
   ];
-  
+
   chrome.tabs.getSelected = function(windowId, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetSelectedTab, windowId, callback);
@@ -250,7 +251,7 @@ var chrome;
     chrome.types.fun
   ];
 
-  chrome.tabs.create = function(tab, callback) {  
+  chrome.tabs.create = function(tab, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(CreateTab, tab, callback);
   };
@@ -301,7 +302,7 @@ var chrome;
     },
     chrome.types.optFun
   ];
-  
+
   chrome.tabs.remove = function(tabId, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(RemoveTab, tabId, callback);
@@ -316,26 +317,26 @@ var chrome;
   // Will *NOT* be followed by tab-attached - it is implied.
   // *MAY* be followed by tab-selection-changed.
   chrome.tabs.onCreated = new chrome.Event("tab-created");
-  
+
   // Sends (tabId, {ChangedProps}).
   chrome.tabs.onUpdated = new chrome.Event("tab-updated");
 
   // Sends (tabId, {windowId, fromIndex, toIndex}).
   // Tabs can only "move" within a window.
   chrome.tabs.onMoved = new chrome.Event("tab-moved");
- 
+
   // Sends (tabId, {windowId}).
-  chrome.tabs.onSelectionChanged = 
+  chrome.tabs.onSelectionChanged =
        new chrome.Event("tab-selection-changed");
-   
+
   // Sends (tabId, {newWindowId, newPosition}).
   // *MAY* be followed by tab-selection-changed.
   chrome.tabs.onAttached = new chrome.Event("tab-attached");
-  
+
   // Sends (tabId, {oldWindowId, oldPosition}).
   // *WILL* be followed by tab-selection-changed.
   chrome.tabs.onDetached = new chrome.Event("tab-detached");
-  
+
   // Sends (tabId).
   // *WILL* be followed by tab-selection-changed.
   // Will *NOT* be followed or preceded by tab-detached.
@@ -351,7 +352,24 @@ var chrome;
     sendRequest(EnablePageAction, [pageActionId, action]);
   }
 
-  chrome.pageActions.enableForTab.params = [  
+  chrome.pageActions.enableForTab.params = [
+    chrome.types.str,
+    {
+      type: "object",
+      properties: {
+        tabId: chrome.types.pInt,
+        url: chrome.types.str
+      },
+      optional: false
+    }
+  ];
+
+  chrome.pageActions.disableForTab = function(pageActionId, action) {
+    validate(arguments, arguments.callee.params);
+    sendRequest(DisablePageAction, [pageActionId, action]);
+  }
+
+  chrome.pageActions.disableForTab.params = [
     chrome.types.str,
     {
       type: "object",
@@ -380,7 +398,7 @@ var chrome;
     chrome.types.singleOrListOf(chrome.types.pInt),
     chrome.types.fun
   ];
-  
+
   chrome.bookmarks.getChildren = function(id, callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetBookmarkChildren, id, callback);
@@ -390,12 +408,12 @@ var chrome;
     chrome.types.pInt,
     chrome.types.fun
   ];
-  
+
   chrome.bookmarks.getTree = function(callback) {
     validate(arguments, arguments.callee.params);
     sendRequest(GetBookmarkTree, null, callback);
   };
-  
+
   // TODO(erikkay): allow it to take an optional id as a starting point
   // BUG=13727
   chrome.bookmarks.getTree.params = [
@@ -497,7 +515,7 @@ var chrome;
 
   // Sends (id, {parentId, index, oldParentId, oldIndex})
   chrome.bookmarks.onMoved = new chrome.Event("bookmark-moved");
-  
+
   // Sends (id, [childrenIds])
   chrome.bookmarks.onChildrenReordered =
       new chrome.Event("bookmark-children-reordered");
@@ -508,7 +526,7 @@ var chrome;
   // Self.
   chrome.self = chrome.self || {};
   chrome.self.onConnect = new chrome.Event("channel-connect");
-  
+
   // Register
   chrome.self.register_ = function() {
     var extensionId = RegisterExtension();