Index: chrome/browser/cocoa/location_bar/location_bar_view_mac.h |
diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h |
index 684aff5b733bb0b878e7ea85e0ce0c88effef2be..67530db342a02cf125b38d90254ed0fd49d87269 100644 |
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h |
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h |
@@ -31,6 +31,7 @@ class EVBubbleDecoration; |
class LocationIconDecoration; |
class Profile; |
class SelectedKeywordDecoration; |
+class StarDecoration; |
class ToolbarModel; |
// A C++ bridge class that represents the location bar UI element to |
@@ -199,30 +200,6 @@ class LocationBarViewMac : public AutocompleteEditController, |
DISALLOW_COPY_AND_ASSIGN(LocationBarImageView); |
}; |
- // Used to display the bookmark star in the RHS. |
- class StarIconView : public LocationBarImageView { |
- public: |
- explicit StarIconView(CommandUpdater* command_updater); |
- virtual ~StarIconView() {} |
- |
- // Shows the bookmark bubble. |
- virtual void OnMousePressed(NSRect bounds); |
- |
- // Set the image and tooltip based on |starred|. |
- void SetStarred(bool starred); |
- |
- virtual NSString* GetToolTip(); |
- |
- private: |
- // For bringing up bookmark bar. |
- CommandUpdater* command_updater_; // Weak, owned by Browser. |
- |
- // The string to show for a tooltip. |
- scoped_nsobject<NSString> tooltip_; |
- |
- DISALLOW_COPY_AND_ASSIGN(StarIconView); |
- }; |
- |
// PageActionImageView is used to display the icon for a given Page Action |
// and notify the extension when the icon is clicked. |
class PageActionImageView : public LocationBarImageView, |
@@ -426,7 +403,7 @@ class LocationBarViewMac : public AutocompleteEditController, |
scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_; |
// Bookmark star right of page actions. |
- StarIconView star_icon_view_; |
+ scoped_ptr<StarDecoration> star_decoration_; |
// Any installed Page Actions. |
PageActionViewList page_action_views_; |