| Index: chrome/browser/cocoa/location_bar_view_mac.h
|
| ===================================================================
|
| --- chrome/browser/cocoa/location_bar_view_mac.h (revision 42429)
|
| +++ chrome/browser/cocoa/location_bar_view_mac.h (working copy)
|
| @@ -241,7 +241,8 @@
|
| virtual void OnMousePressed(NSRect bounds);
|
|
|
| // Overridden from ImageLoadingTracker.
|
| - virtual void OnImageLoaded(SkBitmap* image, size_t index);
|
| + virtual void OnImageLoaded(
|
| + SkBitmap* image, ExtensionResource resource, int index);
|
|
|
| // Called to notify the Page Action that it should determine whether to be
|
| // visible or hidden. |contents| is the TabContents that is active, |url|
|
| @@ -263,7 +264,7 @@
|
| PageActionImageView() : owner_(NULL),
|
| profile_(NULL),
|
| page_action_(NULL),
|
| - tracker_(NULL),
|
| + tracker_(this),
|
| current_tab_id_(-1),
|
| preview_enabled_(false) {}
|
|
|
| @@ -289,7 +290,7 @@
|
|
|
| // The object that is waiting for the image loading to complete
|
| // asynchronously.
|
| - ImageLoadingTracker* tracker_;
|
| + ImageLoadingTracker tracker_;
|
|
|
| // The tab id we are currently showing the icon for.
|
| int current_tab_id_;
|
|
|