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

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/api/prefs/pref_member.h"
+#include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 188 matching lines @@
     GtkRequisition label_req_;
 
     base::WeakPtrFactory<PageToolViewGtk> weak_factory_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(PageToolViewGtk);
   };
 
  private:
   class PageActionViewGtk :
-       public ImageLoadingTracker::Observer,
+       public ExtensionActionIconFactory::Observer,
        public content::NotificationObserver,
        public ExtensionContextMenuModel::PopupDelegate,
        public ExtensionAction::IconAnimation::Observer {
    public:
     PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action);
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     ExtensionAction* page_action() { return page_action_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
     bool IsVisible();
 
     // Called to notify the PageAction that it should determine whether to be
     // visible or hidden. |contents| is the WebContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(content::WebContents* contents, const GURL& url);
 
-    // A callback from ImageLoadingTracker for when the image has loaded.
-    virtual void OnImageLoaded(const gfx::Image& image,
-                               const std::string& extension_id,
-                               int index) OVERRIDE;
+    // Overriden from ExtensionActionIconFactory::Observer.
+    virtual void OnIconUpdated() OVERRIDE;
 
     // Simulate left mouse click on the page action button.
     void TestActivatePageAction();
 
     // Implement the content::NotificationObserver interface.
     virtual void Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) OVERRIDE;
 
     // Overridden from ExtensionContextMenuModel::PopupDelegate:
@@ skipping 23 matching lines @@
     // ExtensionAction::IconAnimationDelegate implementation.
     virtual void OnIconChanged() OVERRIDE;
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     ExtensionAction* page_action_;
 
-    // The object that is waiting for the image loading to complete
-    // asynchronously.
-    ImageLoadingTracker tracker_;
+    // The object that will be used to get the extension action icon for us.
+    // It may load the icon asynchronously (in which case the initial icon
+    // returned by the factory will be transparent), so we have to observe it
+    // for updates to the icon.
+    scoped_ptr<ExtensionActionIconFactory> icon_factory_;
 
     // The widgets for this page action.
     ui::OwnedWidgetGtk event_box_;
     ui::OwnedWidgetGtk image_;
 
     // The tab id we are currently showing the icon for.
     int current_tab_id_;
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
@@ skipping 219 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // Used to remember the URL and title text when drag&drop has begun.
   GURL drag_url_;
   string16 drag_title_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_