| Index: chrome/browser/views/browser_actions_container.h
|
| ===================================================================
|
| --- chrome/browser/views/browser_actions_container.h (revision 42362)
|
| +++ chrome/browser/views/browser_actions_container.h (working copy)
|
| @@ -69,7 +69,7 @@
|
| 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, int index);
|
|
|
| // Overridden from NotificationObserver:
|
| virtual void Observe(NotificationType type,
|
| @@ -105,9 +105,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 +244,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 +365,8 @@
|
| static bool disable_animations_during_testing_;
|
|
|
| private:
|
| + friend class ShowFolderMenuTask;
|
| +
|
| typedef std::vector<BrowserActionView*> BrowserActionViews;
|
|
|
| // ExtensionToolbarModel::Observer implementation.
|
|
|