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

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

Index: chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
index 55cba75e22ff0eaa9b3c682757d7ee83617e4495..e21f02b120902477b2a980d271eb656948ae4481 100644
--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
@@ -53,15 +53,9 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {
   EXTENSION_FUNCTION_VALIDATE(action->GetString(keys::kUrlKey, &url));
 
   std::string title;
-  int icon_id = 0;
   if (enable) {
-    // Both of those are optional.
     if (action->HasKey(keys::kTitleKey))
       EXTENSION_FUNCTION_VALIDATE(action->GetString(keys::kTitleKey, &title));
-    if (action->HasKey(keys::kIconIdKey)) {
-      EXTENSION_FUNCTION_VALIDATE(action->GetInteger(keys::kIconIdKey,

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

Looks like this constant can be removed.
(Of course, I suppose this entire file is deprecated...)

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

Done.

-                                                     &icon_id));
-    }
   }
 
   ExtensionAction* page_action = GetExtension()->page_action();
@@ -70,12 +64,6 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {
     return false;
   }
 
-  if (icon_id < 0 ||
-      static_cast<size_t>(icon_id) >= page_action->icon_paths()->size()) {
-    error_ = (icon_id == 0) ? kNoIconSpecified : kIconIndexOutOfBounds;
-    return false;
-  }
-
   // Find the TabContents that contains this tab id.
   TabContents* contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
@@ -98,7 +86,6 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {
   page_action->SetAppearance(
       tab_id, enable ? ExtensionAction::ACTIVE : ExtensionAction::INVISIBLE);
   page_action->SetTitle(tab_id, title);
-  page_action->SetIconIndex(tab_id, icon_id);
   extensions::TabHelper::FromWebContents(contents->web_contents())->
       location_bar_controller()->NotifyChange();