Refactor setIcon to allow for more general use of imageData.

Review URL: https://codereview.chromium.org/477193003

Cr-Commit-Position: refs/heads/master@{#291119}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291119 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 6 deletions

diff --git a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
index 60ac0c3..5704305 100644
--- a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js
@@ -8,13 +8,15 @@ var binding = require('binding').Binding.create('browserAction');
 
 var setIcon = require('setIcon').setIcon;
 var getExtensionViews = requireNative('runtime').GetExtensionViews;
+var sendRequest = require('sendRequest').sendRequest;
 
 binding.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setHandleRequest('setIcon', function(details, callback) {
-    setIcon(details, callback, this.name, this.definition.parameters,
-        'browser action');
+    setIcon(details, function(args) {
+      sendRequest(this.name, [args, callback], this.definition.parameters);
+    }.bind(this));
   });
 
   apiFunctions.setCustomCallback('openPopup',
diff --git a/chrome/renderer/resources/extensions/page_action_custom_bindings.js b/chrome/renderer/resources/extensions/page_action_custom_bindings.js
index 97a308e..b4f92c6 100644
--- a/chrome/renderer/resources/extensions/page_action_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/page_action_custom_bindings.js
@@ -7,13 +7,15 @@
 var binding = require('binding').Binding.create('pageAction');
 
 var setIcon = require('setIcon').setIcon;
+var sendRequest = require('sendRequest').sendRequest;
 
 binding.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setHandleRequest('setIcon', function(details, callback) {
-    setIcon(details, callback, this.name, this.definition.parameters,
-        'page action');
+    setIcon(details, function(args) {
+      sendRequest(this.name, [args, callback], this.definition.parameters);
+    }.bind(this));
   });
 });
 
diff --git a/chrome/renderer/resources/extensions/system_indicator_custom_bindings.js b/chrome/renderer/resources/extensions/system_indicator_custom_bindings.js
index 91d02a6..e07a9cd 100644
--- a/chrome/renderer/resources/extensions/system_indicator_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/system_indicator_custom_bindings.js
@@ -9,13 +9,15 @@
 var binding = require('binding').Binding.create('systemIndicator');
 
 var setIcon = require('setIcon').setIcon;
+var sendRequest = require('sendRequest').sendRequest;
 
 binding.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setHandleRequest('setIcon', function(details, callback) {
-    setIcon(details, callback, this.name, this.definition.parameters,
-            'system indicator');
+    setIcon(details, function(args) {
+      sendRequest(this.name, [args, callback], this.definition.parameters);
+    }.bind(this));
   });
 });