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

chrome/browser/extensions/extension_page_actions_module.cc

Index: chrome/browser/extensions/extension_page_actions_module.cc
===================================================================
--- chrome/browser/extensions/extension_page_actions_module.cc	(revision 29822)
+++ chrome/browser/extensions/extension_page_actions_module.cc	(working copy)
@@ -212,8 +212,8 @@
   for (size_t i = 0; i < arraysize(color_array); ++i)
     EXTENSION_FUNCTION_VALIDATE(color_value->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]);
   state_->set_badge_background_color(color);
   contents_->PageActionStateChanged();
   return true;
@@ -236,7 +236,10 @@
   for (size_t i = 0; i < arraysize(color_array); ++i)
     EXTENSION_FUNCTION_VALIDATE(color_value->GetInteger(i, &color_array[i]));
 
-  // TODO(mpcomplete): implement text coloring.
+  SkColor color = SkColorSetARGB(color_array[3], color_array[0], color_array[1],
+                                 color_array[2]);
+  state_->set_badge_text_color(color);
+  contents_->PageActionStateChanged();
   return true;
 }
 
Property changes on: chrome\browser\extensions\extension_page_actions_module.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/extension_page_actions_module.cc:r29556