[Mac] Star as a rhs-decoration in AutocompleteTextFieldCell.

chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/cocoa/styled_text_field_cell.h"
 
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
@@ skipping 35 matching lines @@
 
 @end
 
 // AutocompleteTextFieldCell extends StyledTextFieldCell to provide support for
 // certain decorations to be applied to the field.  These are the search hint
 // ("Type to search" on the right-hand side), the keyword hint ("Press [Tab] to
 // search Engine" on the right-hand side), and keyword mode ("Search Engine:" in
 // a button-like token on the left-hand side).
 @interface AutocompleteTextFieldCell : StyledTextFieldCell {
  @private
-  // Decorations which live to the left of the text.  Owned by
-  // |LocationBarViewMac|.
+  // Decorations which live to the left and right of the text, ordered
+  // from outside in.  Decorations are owned by |LocationBarViewMac|.
   std::vector<LocationBarDecoration*> leftDecorations_;
+  std::vector<LocationBarDecoration*> rightDecorations_;
 
   // Set if there is a string to display as a hint on the right-hand
   // side of the field.  Exclusive WRT |keywordString_|;
   scoped_nsobject<NSAttributedString> hintString_;
 
-  // The star icon sits at the right-hand side of the field when an
-  // URL is being shown.
-  LocationBarViewMac::LocationBarImageView* starIconView_;
-
   // List of views showing visible Page Actions. Owned by the location bar.
   // Display is exclusive WRT the |hintString_| and |keywordString_|.
   // This may be NULL during testing.
   LocationBarViewMac::PageActionViewList* page_action_views_;
 
   // List of content blocked icons. This may be NULL during testing.
   LocationBarViewMac::ContentSettingViews* content_setting_views_;
 }
 
 // Chooses |anImage| only if all pieces won't fit w/in |width|.
 // Inputs must be non-nil.
 - (void)setKeywordHintPrefix:(NSString*)prefixString
                        image:(NSImage*)anImage
                       suffix:(NSString*)suffixString
               availableWidth:(CGFloat)width;
 
 // Suppresses hint entirely if |aString| won't fit w/in |width|.
 // String must be non-nil.
 - (void)setSearchHintString:(NSString*)aString
              availableWidth:(CGFloat)width;
 - (void)clearHint;
 
-// Clear |leftDecorations_|.
+// Clear |leftDecorations_| and |rightDecorations_|.
 - (void)clearDecorations;
 
 // Add a new left-side decoration to the right of the existing
 // left-side decorations.
 - (void)addLeftDecoration:(LocationBarDecoration*)decoration;
 
+// Add a new right-side decoration to the left of the existing
+// right-side decorations.
+- (void)addRightDecoration:(LocationBarDecoration*)decoration;
+
 // The width available after accounting for decorations.
 - (CGFloat)availableWidthInFrame:(const NSRect)frame;
 
-- (void)setStarIconView:(LocationBarViewMac::LocationBarImageView*)view;
 - (void)setPageActionViewList:(LocationBarViewMac::PageActionViewList*)list;
 - (void)setContentSettingViewsList:
     (LocationBarViewMac::ContentSettingViews*)views;
 
 // Returns an array of the visible AutocompleteTextFieldIcon objects. Returns
 // only visible icons.
 - (NSArray*)layedOutIcons:(NSRect)cellFrame;
 
-// Return the rectangle the star is being shown in, for purposes of
-// positioning the bookmark bubble.
-- (NSRect)starIconFrameForFrame:(NSRect)cellFrame;
-
 // Return the frame for |aDecoration| if the cell is in |cellFrame|.
 // Returns |NSZeroRect| for decorations which are not currently
 // visible.
 - (NSRect)frameForDecoration:(const LocationBarDecoration*)aDecoration
                      inFrame:(NSRect)cellFrame;
 
 // Returns the portion of the cell to use for displaying the Page
 // Action icon at the given index. May be NSZeroRect if the index's
 // action is not visible.  This does a linear walk over all page
 // actions, so do not call this in a loop to get the position of all
@@ skipping 29 matching lines @@
 // Internal methods here exposed for unit testing.
 @interface AutocompleteTextFieldCell (UnitTesting)
 
 @property(nonatomic, readonly) NSAttributedString* hintString;
 @property(nonatomic, readonly) NSAttributedString* hintIconLabel;
 
 // Returns the total number of installed Page Actions, visible or not.
 - (size_t)pageActionCount;
 
 @end