Change browser/page action default icon defined in manifest to support hidpi.

chrome/common/extensions/extension_action.cc

Index: chrome/common/extensions/extension_action.cc
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 448aa11e6179916c9cdca5fc4c7043141aff5e6d..fbde6f265e2919bb716f1f6aeb49657779db18c2 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/common/badge_util.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
@@ -61,6 +62,19 @@ const int kMaxTextWidth = 23;
 // The minimum width for center-aligning the badge.
 const int kCenterAlignThreshold = 20;
 
+int GetIconWidthForActionType(ExtensionAction::Type type) {

[Jeffrey Yasskin, 2012/09/14 23:47:12]

You also have this function as GetIconSizeForType() in
chrome/browser/extensions/extension_action_icon_factory.cc. Please only add it
once. 

[tbarzic, 2012/09/15 00:29:10]

Done.

+  switch (type) {
+    case ExtensionAction::TYPE_BROWSER:
+    case ExtensionAction::TYPE_PAGE:
+      return extension_misc::EXTENSION_ICON_ACTION;
+    case ExtensionAction::TYPE_SCRIPT_BADGE:
+      return extension_misc::EXTENSION_ICON_BITTY;
+    default:
+      NOTREACHED();
+      return 0;
+  }
+}
+
 class GetAttentionImageSource : public gfx::ImageSkiaSource {
  public:
   explicit GetAttentionImageSource(const gfx::ImageSkia& icon)
@@ -253,8 +267,14 @@ scoped_ptr<ExtensionAction> ExtensionAction::CopyForTest() const {
   copy->badge_text_color_ = badge_text_color_;
   copy->appearance_ = appearance_;
   copy->icon_animation_ = icon_animation_;
-  copy->default_icon_path_ = default_icon_path_;
   copy->id_ = id_;
+
+  if (default_icon_.get()) {
+    scoped_ptr<ExtensionIconSet> default_icon_copy(new ExtensionIconSet());
+    default_icon_->CopyForTest(default_icon_copy.get());
+    copy->default_icon_ = default_icon_copy.Pass();
+  }
+
   return copy.Pass();
 }
 
@@ -275,27 +295,14 @@ GURL ExtensionAction::GetPopupUrl(int tab_id) const {
   return GetValue(&popup_url_, tab_id);
 }
 
-void ExtensionAction::CacheIcon(const gfx::Image& icon) {
-  if (!icon.IsEmpty())
-    cached_icon_.reset(new gfx::ImageSkia(*icon.ToImageSkia()));
-}
-
 void ExtensionAction::SetIcon(int tab_id, const gfx::Image& image) {
   SetValue(&icon_, tab_id, image.AsImageSkia());
 }
 
-gfx::Image ExtensionAction::GetIcon(int tab_id) const {
-  // Check if a specific icon is set for this tab.
-  gfx::ImageSkia icon = GetExplicitlySetIcon(tab_id);
-  if (icon.isNull()) {
-    if (cached_icon_.get()) {
-      icon = *cached_icon_;
-    } else {
-      icon = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_EXTENSIONS_FAVICON);
-    }
-  }
-
+gfx::Image ExtensionAction::ApplyAttentionAndAnimation(

[Jeffrey Yasskin, 2012/09/14 23:47:12]

Somewhere in this sequence of refactorings, the point of returning
gfx::Image—that it can cache the conversions to GdkPixbuf and NSImage—was lost.
No need to do it in this CL, but if it ever gets more convenient, feel free to
switch all of these to returning ImageSkia.

[tbarzic, 2012/09/15 00:29:10]

Initially I wanted to make all of this to return ImageSkia, but rsesek@ had
objections about that (gfx::Image should be used when the image could be used on
more different platforms, which is the case here)

+    const gfx::ImageSkia& original_icon,
+    int tab_id) const {
+  gfx::ImageSkia icon = original_icon;
   if (GetValue(&appearance_, tab_id) == WANTS_ATTENTION)
     icon = gfx::ImageSkia(new GetAttentionImageSource(icon), icon.size());
 
@@ -343,7 +350,7 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
       GetBadgeText(tab_id),
       GetBadgeTextColor(tab_id),
       GetBadgeBackgroundColor(tab_id),
-      GetValue(&icon_, tab_id).size().width());
+      GetIconWidth(tab_id));
 }
 
 gfx::ImageSkia ExtensionAction::GetIconWithBadge(
@@ -362,6 +369,23 @@ gfx::ImageSkia ExtensionAction::GetIconWithBadge(
      icon.size());
 }
 
+// Determines which icon would be returned by |GetIcon|, and returns its width.
+int ExtensionAction::GetIconWidth(int tab_id) const {
+  // If icon has been set, return its width.
+  gfx::ImageSkia icon = GetValue(&icon_, tab_id);
+  if (!icon.isNull())
+    return icon.width();
+  // If there is a default icon, the icon width will be set depending on our
+  // action type.
+  if (default_icon_.get())
+    return GetIconWidthForActionType(action_type());
+
+  // If no icon has been set and there is no default icon, we need favicon
+  // width.
+  return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_EXTENSIONS_FAVICON).ToImageSkia()->width();
+}
+
 // static
 void ExtensionAction::DoPaintBadge(gfx::Canvas* canvas,
                                    const gfx::Rect& bounds,