| Index: chrome/browser/cocoa/location_bar/location_icon_decoration.h
|
| diff --git a/chrome/browser/cocoa/location_bar/location_icon_decoration.h b/chrome/browser/cocoa/location_bar/location_icon_decoration.h
|
| index 68aaeeee117b43970e1254126d24825756cdf524..18952d29e8c7e6e90bda5638ff6cd30d99c27f50 100644
|
| --- a/chrome/browser/cocoa/location_bar/location_icon_decoration.h
|
| +++ b/chrome/browser/cocoa/location_bar/location_icon_decoration.h
|
| @@ -7,27 +7,18 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| -#include "base/scoped_nsobject.h"
|
| -#include "chrome/browser/cocoa/location_bar/location_bar_decoration.h"
|
| +#include "chrome/browser/cocoa/location_bar/image_decoration.h"
|
|
|
| class LocationBarViewMac;
|
|
|
| // LocationIconDecoration is used to display an icon to the left of
|
| // the address.
|
|
|
| -class LocationIconDecoration : public LocationBarDecoration {
|
| +class LocationIconDecoration : public ImageDecoration {
|
| public:
|
| explicit LocationIconDecoration(LocationBarViewMac* owner);
|
| virtual ~LocationIconDecoration();
|
|
|
| - // The image to display for the location.
|
| - NSImage* GetImage();
|
| - void SetImage(NSImage* image);
|
| -
|
| - // Implement |LocationBarDecoration|.
|
| - virtual CGFloat GetWidthForSpace(CGFloat width);
|
| - virtual void DrawInFrame(NSRect frame, NSView* control_view);
|
| -
|
| // Allow dragging the current URL.
|
| virtual bool IsDraggable();
|
| virtual NSPasteboard* GetDragPasteboard();
|
| @@ -40,8 +31,6 @@ class LocationIconDecoration : public LocationBarDecoration {
|
| // The location bar view that owns us.
|
| LocationBarViewMac* owner_;
|
|
|
| - scoped_nsobject<NSImage> image_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(LocationIconDecoration);
|
| };
|
|
|
|
|