Remove support for page_action.icons, and the legacy code surrounding it.

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/base64.h"
 #include "base/string_number_conversions.h"
@@ skipping 24 matching lines @@
 const char kIconStorageKey[] = "icon";
 const char kBadgeTextStorageKey[] = "badge_text";
 const char kBadgeBackgroundColorStorageKey[] = "badge_background_color";
 const char kBadgeTextColorStorageKey[] = "badge_text_color";
 const char kAppearanceStorageKey[] = "appearance";
 
 // Errors.
 const char kNoExtensionActionError[] =
     "This extension has no action specified.";
 const char kNoTabError[] = "No tab with id: *.";
 const char kIconIndexOutOfBounds[] = "Page action icon index out of bounds.";

[Yoyo Zhou, 2012/09/13 20:42:39]

Can be removed.

[Matt Perry, 2012/09/13 21:39:28]

Done.

 
 struct IconRepresentationInfo {
   // Size as a string that will be used to retrieve representation value from
   // SetIcon function arguments.
   const char* size_string;
   // Scale factor for which the represantion should be used.
   ui::ScaleFactor scale;
 };
 
 
@@ skipping 377 matching lines @@
   return SetVisible(true);
 }
 
 bool ExtensionActionHideFunction::RunExtensionAction() {
   return SetVisible(false);
 }
 
 bool ExtensionActionSetIconFunction::RunExtensionAction() {
   // setIcon can take a variant argument: either a dictionary of canvas
   // ImageData, or an icon index.
-  int icon_index;
   base::DictionaryValue* canvas_set = NULL;
   if (details_->GetDictionary("imageData", &canvas_set)) {
     gfx::ImageSkia icon;
     // Extract icon representations from the ImageDataSet dictionary.
     for (size_t i = 0; i < arraysize(kIconSizes); i++) {
       base::BinaryValue* binary;
       if (canvas_set->GetBinary(kIconSizes[i].size_string, &binary)) {
         IPC::Message pickle(binary->GetBuffer(), binary->GetSize());
         PickleIterator iter(pickle);
         SkBitmap bitmap;
         EXTENSION_FUNCTION_VALIDATE(IPC::ReadParam(&pickle, &iter, &bitmap));
         CHECK(!bitmap.isNull());
         icon.AddRepresentation(gfx::ImageSkiaRep(bitmap, kIconSizes[i].scale));
       }
     }
 
     extension_action_->SetIcon(tab_id_, gfx::Image(icon));
-  } else if (details_->GetInteger("iconIndex", &icon_index)) {
-    // If --enable-script-badges 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_, gfx::Image());
-    extension_action_->SetIconIndex(tab_id_, icon_index);
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
   NotifyChange();
   return true;
 }
 
 bool ExtensionActionSetTitleFunction::RunExtensionAction() {
   std::string title;
   EXTENSION_FUNCTION_VALIDATE(details_->GetString("title", &title));
@@ skipping 70 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)));
   SetResult(list);
   return true;
 }