Eliminate all UI thread decoding of extension images....

chrome/browser/views/browser_actions_container.h

 // Copyright (c) 2010 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
   const SkBitmap& default_icon() const { return default_icon_; }
 
   // Overridden from views::View. Return a 0-inset so the icon can draw all the
   // way to the edge of the view if it wants.
   virtual gfx::Insets GetInsets() const;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // Overridden from ImageLoadingTracker.
-  virtual void OnImageLoaded(SkBitmap* image, size_t index);
+  virtual void OnImageLoaded(
+      SkBitmap* image, ExtensionResource resource, int index);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // MenuButton behavior overrides.  These methods all default to TextButton
   // behavior unless this button is a popup.  In that case, it uses MenuButton
   // behavior.  MenuButton has the notion of a child popup being shown where the
   // button will stay in the pushed state until the "menu" (a popup in this
@@ skipping 15 matching lines @@
 
  private:
   // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   Extension* extension_;
 
   // The object that is waiting for the image loading to complete
-  // asynchronously. This object can potentially outlive the BrowserActionView,
-  // and takes care of deleting itself.
-  ImageLoadingTracker* tracker_;
+  // asynchronously.
+  ImageLoadingTracker tracker_;
 
   // Whether we are currently showing/just finished showing a context menu.
   bool showing_context_menu_;
 
   // The default icon for our browser action. This might be non-empty if the
   // browser action had a value for default_icon in the manifest.
   SkBitmap default_icon_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
@@ skipping 117 matching lines @@
 class BrowserActionsContainer
   : public views::View,
     public views::ViewMenuDelegate,
     public views::DragController,
     public views::ResizeGripper::ResizeGripperDelegate,
     public AnimationDelegate,
     public ExtensionToolbarModel::Observer,
     public BrowserActionOverflowMenuController::Observer,
     public ExtensionContextMenuModel::PopupDelegate,
     public ExtensionPopup::Observer {
-
-  friend class ShowFolderMenuTask;
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Get the number of browser actions being displayed.
   int num_browser_actions() const { return browser_action_views_.size(); }
 
   // Whether we are performing resize animation on the container.
@@ skipping 101 matching lines @@
   // Set how many icons the container should show. This should only be used by
   // unit tests.
   void TestSetIconVisibilityCount(size_t icons);
 
   // During testing we can disable animations by setting this flag to true,
   // so that the bar resizes instantly, instead of having to poll it while it
   // animates to open/closed status.
   static bool disable_animations_during_testing_;
 
  private:
+  friend class ShowFolderMenuTask;
+
   typedef std::vector<BrowserActionView*> BrowserActionViews;
 
   // ExtensionToolbarModel::Observer implementation.
   virtual void BrowserActionAdded(Extension* extension, int index);
   virtual void BrowserActionRemoved(Extension* extension);
   virtual void BrowserActionMoved(Extension* extension, int index);
 
   // Closes the overflow menu if open.
   void CloseOverflowMenu();
 
@@ skipping 97 matching lines @@
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_