[Mac] Move star button into page-actions area of omnibox.

chrome/browser/cocoa/location_bar_view_mac.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 55 matching lines @@
   }
   virtual LocationBarTesting* GetLocationBarForTesting() { return this; }
 
   // Overridden from LocationBarTesting:
   virtual int PageActionCount();
   virtual int PageActionVisibleCount();
   virtual ExtensionAction* GetPageAction(size_t index);
   virtual ExtensionAction* GetVisiblePageAction(size_t index);
   virtual void TestPageActionPressed(size_t index);
 
+  // Set the starred state of the bookmark star.
+  void SetStarred(bool starred);
+
   // Updates the location bar.  Resets the bar's permanent text and
   // security style, and if |should_restore_state| is true, restores
   // saved state from the tab (for tab switching).
   void Update(const TabContents* tab, bool should_restore_state);
 
   // Returns the current TabContents.
   TabContents* GetTabContents() const;
 
   // Sets preview_enabled_ for the PageActionImageView associated with this
   // |page_action|. If |preview_enabled|, the location bar will display the
@@ skipping 46 matching lines @@
   // Used to display a clickable icon in the location bar.
   class LocationBarImageView {
    public:
     explicit LocationBarImageView() : image_(nil),
                                       label_(nil),
                                       visible_(false) {}
     virtual ~LocationBarImageView() {}
 
     // Sets the image.
     void SetImage(NSImage* image);
-    void SetImage(SkBitmap* image);
+
+    // Get the |resource_id| image resource and set the image.
+    void SetIcon(int resource_id);
 
     // Sets the label text, font, and color. |text| may be nil; |color| and
     // |font| are ignored if |text| is nil.
     void SetLabel(NSString* text, NSFont* baseFont, NSColor* color);
 
     // Sets the visibility. SetImage() should be called with a valid image
     // before the visibility is set to |true|.
     void SetVisible(bool visible);
 
     const NSImage* GetImage() const { return image_; }
@@ skipping 35 matching lines @@
     // Shows the page info dialog.
     virtual void OnMousePressed(NSRect bounds);
 
    private:
     // The location bar view that owns us.
     LocationBarViewMac* owner_;
 
     DISALLOW_COPY_AND_ASSIGN(LocationIconView);
   };
 
+  // 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 const 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,
                               public ImageLoadingTracker::Observer,
                               public NotificationObserver {
    public:
     PageActionImageView(LocationBarViewMac* owner,
                         Profile* profile,
                         ExtensionAction* page_action);
     virtual ~PageActionImageView();
@@ skipping 182 matching lines @@
 
   // The user's desired disposition for how their input should be opened.
   WindowOpenDisposition disposition_;
 
   // A view that shows an icon to the left of the address.
   LocationIconView location_icon_view_;
 
   // Security info as text which floats left of the page actions.
   LocationBarImageView security_label_view_;
 
+  // Bookmark star right of page actions.
+  StarIconView star_icon_view_;
+
   // Any installed Page Actions.
   PageActionViewList page_action_views_;
 
   // The content blocked views.
   ContentSettingViews content_setting_views_;
 
   Profile* profile_;
 
   Browser* browser_;
 
   ToolbarModel* toolbar_model_;  // Weak, owned by Browser.
 
   // Image used in drawing keyword hint.
   scoped_nsobject<NSImage> tab_button_image_;
 
   // The transition type to use for the navigation.
   PageTransition::Type transition_;
 
   // Used to register for notifications received by NotificationObserver.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_