Move icon fallbacks into ExtensionAction.

chrome/browser/ui/views/location_bar/page_action_image_view.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/ui/views/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
@@ skipping 164 matching lines @@
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
   if (!page_action_->default_icon_path().empty())
     total_icons++;
   DCHECK(index < total_icons);
 
   // Map the index of the loaded image back to its name. If we ever get an
   // index greater than the number of icons, it must be the default icon.
   if (!image.IsEmpty()) {
-    const SkBitmap* bitmap = image.ToSkBitmap();
     if (index < static_cast<int>(page_action_->icon_paths()->size()))
-      page_action_icons_[page_action_->icon_paths()->at(index)] = *bitmap;
+      page_action_icons_[page_action_->icon_paths()->at(index)] = image;
     else
-      page_action_icons_[page_action_->default_icon_path()] = *bitmap;
+      page_action_icons_[page_action_->default_icon_path()] = image;
   }
 
   // During object construction owner_ will be NULL.
   TabContents* tab_contents = owner_ ? owner_->GetTabContents() : NULL;
   if (tab_contents)
     UpdateVisibility(tab_contents->web_contents(), current_url_);
 }
 
 void PageActionImageView::ShowContextMenuForView(View* source,
                                                  const gfx::Point& point) {
@@ skipping 39 matching lines @@
       (!preview_enabled_ && !page_action_->GetIsVisible(current_tab_id_))) {
     SetVisible(false);
     return;
   }
 
   // Set the tooltip.
   tooltip_ = page_action_->GetTitle(current_tab_id_);
   SetTooltipText(UTF8ToUTF16(tooltip_));
 
   // Set the image.
-  // It can come from three places. In descending order of priority:
-  // - The developer can set it dynamically by path or bitmap. It will be in
-  //   page_action_->GetIcon().
-  // - The developer can set it dynamically by index. It will be in
-  //   page_action_->GetIconIndex().
-  // - It can be set in the manifest by path. It will be in
-  //   page_action_->default_icon_path().
-
-  // First look for a dynamically set bitmap.
-  SkBitmap icon = page_action_->GetIcon(current_tab_id_);
-  if (icon.isNull()) {
-    int icon_index = page_action_->GetIconIndex(current_tab_id_);
-    std::string icon_path = (icon_index < 0) ?
-        page_action_->default_icon_path() :
-        page_action_->icon_paths()->at(icon_index);
-    if (!icon_path.empty()) {
-      PageActionMap::iterator iter = page_action_icons_.find(icon_path);
-      if (iter != page_action_icons_.end())
-        icon = iter->second;
-    }
-  }
-
-  if (!icon.isNull()) {
-    const ExtensionAction::IconAnimation* icon_animation =
-        scoped_icon_animation_observer_.icon_animation();
-    if (icon_animation)
-      icon = icon_animation->Apply(icon);
-    SetImage(icon);
+  gfx::Image icon = page_action_->GetIcon(current_tab_id_, page_action_icons_);
+  if (!icon.IsEmpty()) {
+    SetImage(*icon.ToImageSkia());
   }
 
   SetVisible(true);
 }
 
 void PageActionImageView::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(popup_->GetWidget(), widget);
   popup_->GetWidget()->RemoveObserver(this);
   popup_ = NULL;
 }
@@ skipping 29 matching lines @@
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
 
   popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow_location);
   popup_->GetWidget()->AddObserver(this);
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }