Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: chrome/browser/views/browser_actions_container.h

Issue 1075006: Eliminate all UI thread decoding of extension images.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/views/browser_actions_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/browser_actions_container.h
===================================================================
--- chrome/browser/views/browser_actions_container.h (revision 42429)
+++ chrome/browser/views/browser_actions_container.h (working copy)
@@ -69,7 +69,8 @@
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,
@@ -105,9 +106,8 @@
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_;
@@ -245,8 +245,6 @@
public BrowserActionOverflowMenuController::Observer,
public ExtensionContextMenuModel::PopupDelegate,
public ExtensionPopup::Observer {
-
- friend class ShowFolderMenuTask;
public:
BrowserActionsContainer(Browser* browser, views::View* owner_view);
virtual ~BrowserActionsContainer();
@@ -368,6 +366,8 @@
static bool disable_animations_during_testing_;
private:
+ friend class ShowFolderMenuTask;
+
typedef std::vector<BrowserActionView*> BrowserActionViews;
// ExtensionToolbarModel::Observer implementation.
« no previous file with comments | « chrome/browser/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698