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

chrome/browser/extensions/extension_page_actions_module.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_page_actions_module.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/profile.h"
@@ skipping 194 matching lines @@
     return false;
 
   ListValue* color_value;
   EXTENSION_FUNCTION_VALIDATE(args->GetList(L"color", &color_value));
   EXTENSION_FUNCTION_VALIDATE(color_value->GetSize() == 4);
 
   int color_array[4] = {0};
   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;
 }
 
 bool PageActionSetBadgeTextColorFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
   const DictionaryValue* args = static_cast<const DictionaryValue*>(args_);
 
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger(L"tabId", &tab_id));
   if (!InitCommon(tab_id))
     return false;
 
   ListValue* color_value;
   EXTENSION_FUNCTION_VALIDATE(args->GetList(L"color", &color_value));
   EXTENSION_FUNCTION_VALIDATE(color_value->GetSize() == 4);
 
   int color_array[4] = {0};
   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;
 }
 
 bool PageActionSetBadgeTextFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
   const DictionaryValue* args = static_cast<const DictionaryValue*>(args_);
 
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger(L"tabId", &tab_id));
   if (!InitCommon(tab_id))
     return false;
 
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args->GetString(L"text", &text));
 
   state_->set_badge_text(text);
   contents_->PageActionStateChanged();
   return true;
 }