Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/common/badge_util.h"
@@ skipping 286 matching lines @@
   if (!icon.IsEmpty())
     path_to_icon_cache_.insert(std::make_pair(path, *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 = GetValue(&icon_, tab_id);
+  gfx::ImageSkia icon = GetExplicitlySetIcon(tab_id);
   if (icon.empty()) {
     // Need to find an icon from a path.
     const std::string* path = NULL;
     // Check if one of the elements of icon_path() was selected.
     int icon_index = GetIconIndex(tab_id);
     if (icon_index >= 0) {
       path = &icon_paths()->at(icon_index);
     } else {
       // Otherwise, use the default icon.
       path = &default_icon_path();
     }
 
     std::map<std::string, gfx::ImageSkia>::const_iterator cached_icon =
         path_to_icon_cache_.find(*path);
     if (cached_icon != path_to_icon_cache_.end()) {
       icon = cached_icon->second;
     } else {
       icon = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_EXTENSIONS_FAVICON);
     }
   }
 
   if (GetValue(&appearance_, tab_id) == WANTS_ATTENTION)
     icon = gfx::ImageSkia(new GetAttentionImageSource(icon), icon.size());
 
   return gfx::Image(ApplyIconAnimation(tab_id, icon));
 }
 
+gfx::ImageSkia ExtensionAction::GetExplicitlySetIcon(int tab_id) const {
+  return GetValue(&icon_, tab_id);
+}
+
 void ExtensionAction::SetIconIndex(int tab_id, int index) {
   if (static_cast<size_t>(index) >= icon_paths_.size()) {
     NOTREACHED();
     return;
   }
   SetValue(&icon_index_, tab_id, index);
 }
 
 bool ExtensionAction::SetAppearance(int tab_id, Appearance new_appearance) {
   const Appearance old_appearance = GetValue(&appearance_, tab_id);
@@ skipping 175 matching lines @@
       new AnimatedIconImageSource(icon, animation_wrapper->animation()),
       icon.size());
 }
 
 void ExtensionAction::RunIconAnimation(int tab_id) {
   IconAnimationWrapper* icon_animation =
       new IconAnimationWrapper();
   icon_animation_[tab_id] = icon_animation->AsWeakPtr();
   icon_animation->animation()->Start();
 }