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

chrome/browser/ui/views/browser_action_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/browser_action_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 44 matching lines @@
 
 BrowserActionView::~BrowserActionView() {
   button_->Destroy();
 }
 
 gfx::ImageSkia BrowserActionView::GetIconWithBadge() {
   int tab_id = delegate_->GetCurrentTabId();
 
   const ExtensionAction* action = button_->extension()->browser_action();
   gfx::Size spacing(0, ToolbarView::kVertSpacing);
-  gfx::ImageSkia icon = *action->GetIcon(tab_id).ToImageSkia();
+  gfx::ImageSkia icon = *button_->icon_factory().GetIcon(tab_id).ToImageSkia();
   if (!button_->IsEnabled(tab_id))
     icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
   return action->GetIconWithBadge(icon, tab_id, spacing);
 }
 
 void BrowserActionView::Layout() {
   // We can't rely on button_->GetPreferredSize() here because that's not set
   // correctly until the first call to
   // BrowserActionsContainer::RefreshBrowserActionViews(), whereas this can be
   // called before that when the initial bounds are set (and then not after,
@@ skipping 28 matching lines @@
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(const Extension* extension,
                                          Browser* browser,
                                          BrowserActionView::Delegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           MenuButton(this, string16(), NULL, false)),
       browser_(browser),
       browser_action_(extension->browser_action()),
       extension_(extension),
-      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          icon_factory_(extension, extension->browser_action(), this)),
       delegate_(delegate),
       context_menu_(NULL),
       called_registered_extension_command_(false) {
   set_border(NULL);
   set_alignment(TextButton::ALIGN_CENTER);
   set_context_menu_controller(this);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
@@ skipping 13 matching lines @@
   if (context_menu_) {
     context_menu_->Cancel();
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 void BrowserActionButton::ViewHierarchyChanged(
     bool is_add, View* parent, View* child) {
-  if (is_add && child == this) {
-    // The Browser Action API does not allow the default icon path to be
-    // changed at runtime, so we can load this now and cache it.
-    std::string relative_path = browser_action_->default_icon_path();
-    if (!relative_path.empty()) {
-      // LoadImage is not guaranteed to be synchronous, so we might see the
-      // callback OnImageLoaded execute immediately. It (through UpdateState)
-      // expects parent() to return the owner for this button, so this
-      // function is as early as we can start this request.
-      tracker_.LoadImage(extension_, extension_->GetResource(relative_path),
-                         gfx::Size(Extension::kBrowserActionIconMaxSize,
-                                   Extension::kBrowserActionIconMaxSize),
-                         ImageLoadingTracker::DONT_CACHE);
-    }
-  }
 
   if (is_add && !called_registered_extension_command_ && GetFocusManager()) {
     MaybeRegisterExtensionCommand();
     called_registered_extension_command_ = true;
   }
 
   MenuButton::ViewHierarchyChanged(is_add, parent, child);
 }
 
 bool BrowserActionButton::CanHandleAccelerators() const {
@@ skipping 34 matching lines @@
           views::MenuRunner::CONTEXT_MENU) ==
       views::MenuRunner::MENU_DELETED) {
     return;
   }
 
   menu_runner_.reset();
   SetButtonNotPushed();
   context_menu_ = NULL;
 }
 
-void BrowserActionButton::OnImageLoaded(const gfx::Image& image,
-                                        const std::string& extension_id,
-                                        int index) {
-  browser_action_->CacheIcon(image);
-
-  // Call back to UpdateState() because a more specific icon might have been set
-  // while the load was outstanding.
-  UpdateState();
-}
-
 void BrowserActionButton::UpdateState() {
   int tab_id = delegate_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
   SetShowMultipleIconStates(delegate_->NeedToShowMultipleIconStates());
 
   if (!IsEnabled(tab_id)) {
     SetState(views::CustomButton::BS_DISABLED);
   } else {
     SetState(menu_visible_ ?
              views::CustomButton::BS_PUSHED :
              views::CustomButton::BS_NORMAL);
   }
 
-  gfx::ImageSkia icon = *browser_action()->GetIcon(tab_id).ToImageSkia();
+  gfx::ImageSkia icon = *icon_factory_.GetIcon(tab_id).ToImageSkia();
 
   if (!icon.isNull()) {
     if (!browser_action()->GetIsVisible(tab_id))
       icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     gfx::ImageSkia bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION);
     SetIcon(gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon));
 
@@ skipping 48 matching lines @@
           MaybeUnregisterExtensionCommand(true);
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
+void BrowserActionButton::OnIconUpdated() {
+  UpdateState();
+}
+
 bool BrowserActionButton::Activate() {
   if (!IsPopup())
     return true;
 
   delegate_->OnBrowserActionExecuted(this);
 
   // TODO(erikkay): Run a nested modal loop while the mouse is down to
   // enable menu-like drag-select behavior.
 
   // The return value of this method is returned via OnMousePressed.
@@ skipping 90 matching lines @@
 
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
   }
 }