Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

chrome/browser/extensions/extension_browser_actions_api.cc

Index: chrome/browser/extensions/extension_browser_actions_api.cc
===================================================================
--- chrome/browser/extensions/extension_browser_actions_api.cc	(revision 29822)
+++ chrome/browser/extensions/extension_browser_actions_api.cc	(working copy)
@@ -115,8 +115,8 @@
     EXTENSION_FUNCTION_VALIDATE(list->GetInteger(i, &color_array[i]));
   }
 
-  SkColor color = SkColorSetARGB(color_array[0], color_array[1], color_array[2],
-                                 color_array[3]);
+  SkColor color = SkColorSetARGB(color_array[3], color_array[0], color_array[1],
+                                 color_array[2]);
 
   Extension* extension = dispatcher()->GetExtension();
   if (!extension->browser_action()) {
Property changes on: chrome\browser\extensions\extension_browser_actions_api.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/extension_browser_actions_api.cc:r29556