Remove browser-actions-for-all flag and replace funcionality with action-box.

chrome/browser/extensions/api/extension_action/extension_actions_api.cc

 // Copyright (c) 2012 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/api/extension_action/extension_actions_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 140 matching lines @@
       return false;
     if (color_ints[i] > 255 || color_ints[i] < 0)
       return false;
   }
 
   *result = SkColorSetARGB(255, color_ints[0], color_ints[1], color_ints[2]);
   return true;
 }
 
 bool ExtensionActionFunction::SetVisible(bool visible) {
-  // If --browser-actions-for-all is enabled there will be a browser_action
-  // here instead of a page action. Until we decide what to do with that, just
-  // ignore.
+  // If --enable-action-box is on there will be a browser_action here instead
+  // of a page action. Until we decide what to do with that, just ignore.
   if (!GetExtension()->page_action())
     return true;
   extension_action_->SetIsVisible(tab_id_, visible);
   NotifyChange();
   return true;
 }
 
 bool ExtensionActionShowFunction::RunExtensionAction() {
   return SetVisible(true);
 }
 
 bool ExtensionActionHideFunction::RunExtensionAction() {
   return SetVisible(false);
 }
 
 bool ExtensionActionSetIconFunction::RunExtensionAction() {
   // setIcon can take a variant argument: either a canvas ImageData, or an
   // icon index.
   base::BinaryValue* binary = NULL;
   int icon_index;
   if (details_->GetBinary("imageData", &binary)) {
     IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
     PickleIterator iter(bitmap_pickle);
     SkBitmap bitmap;
     EXTENSION_FUNCTION_VALIDATE(
         IPC::ReadParam(&bitmap_pickle, &iter, &bitmap));
     extension_action_->SetIcon(tab_id_, bitmap);
   } else if (details_->GetInteger("iconIndex", &icon_index)) {
-    // If --browser-actions-for-all is enabled there might legitimately be an
-    // iconIndex set. Until we decide what to do with that, ignore.
+    // If --enable-action-box is on there might legitimately be an iconIndex
+    // set. Until we decide what to do with that, ignore.
     if (!GetExtension()->page_action())
       return true;
     if (icon_index < 0 ||
         static_cast<size_t>(icon_index) >=
             extension_action_->icon_paths()->size()) {
       error_ = kIconIndexOutOfBounds;
       return false;
     }
     extension_action_->SetIcon(tab_id_, SkBitmap());
     extension_action_->SetIconIndex(tab_id_, icon_index);
@@ skipping 81 matching lines @@
 bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
   ListValue* list = new ListValue();
   SkColor color = extension_action_->GetBadgeBackgroundColor(tab_id_);
   list->Append(Value::CreateIntegerValue(SkColorGetR(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetG(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetB(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetA(color)));
   result_.reset(list);
   return true;
 }