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

chrome/browser/cocoa/autocomplete_text_field_cell.mm

 // 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 "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "gfx/font.h"
 
@@ skipping 254 matching lines @@
 }
 
 - (void)setPageActionViewList:(LocationBarViewMac::PageActionViewList*)list {
   page_action_views_ = list;
 }
 
 - (void)setLocationIconView:(LocationBarViewMac::LocationIconView*)view {
   locationIconView_ = view;
 }
 
+- (void)setStarIconView:(LocationBarViewMac::LocationBarImageView*)view {
+  starIconView_ = view;
+}
+
 - (void)setSecurityLabelView:(LocationBarViewMac::LocationBarImageView*)view {
   securityLabelView_ = view;
 }
 
 - (void)setContentSettingViewsList:
     (LocationBarViewMac::ContentSettingViews*)views {
   content_setting_views_ = views;
 }
 
 // Overriden to account for the hint strings and hint icons.
@@ skipping 48 matching lines @@
   if (!locationIconView_ || !locationIconView_->IsVisible())
     return NSZeroRect;
 
   const NSSize imageSize = locationIconView_->GetImageSize();
   const CGFloat yOffset = floor((NSHeight(cellFrame) - imageSize.height) / 2);
   return NSMakeRect(NSMinX(cellFrame) + kLocationIconXOffset,
                     NSMinY(cellFrame) + yOffset,
                     imageSize.width, imageSize.height);
 }
 
+- (NSRect)starIconFrameForFrame:(NSRect)cellFrame {
+  if (!starIconView_ || !starIconView_->IsVisible())
+    return NSZeroRect;
+
+  // The star icon is always at the RHS.
+  scoped_nsobject<AutocompleteTextFieldIcon> icon(
+        [[AutocompleteTextFieldIcon alloc] initImageWithView:starIconView_]);
+  cellFrame.size.width -= kHintXOffset;
+  [icon positionInFrame:cellFrame];
+  return [icon rect];
+}
+
 - (size_t)pageActionCount {
   // page_action_views_ may be NULL during testing, or if the
   // containing LocationViewMac object has already been destructed
   // (happens sometimes during window shutdown).
   if (!page_action_views_)
     return 0;
   return page_action_views_->Count();
 }
 
 - (NSRect)pageActionFrameForIndex:(size_t)index inFrame:(NSRect)cellFrame {
@@ skipping 111 matching lines @@
   }
 
   // TODO(shess): Previous implementation of this method made a
   // right-to-left array, so add the page-action items in that order.
   // As part of the refactor mentioned above, lay everything out
   // nicely left-to-right.
   for (size_t i = [self pageActionCount]; i-- > 0;) {
     views.push_back(page_action_views_->ViewAt(i));
   }
 
+  // The star icon should always come last.
+  if (starIconView_)
+    views.push_back(starIconView_);
+
   // Load the visible views into |result|.
   for (std::vector<LocationBarViewMac::LocationBarImageView*>::const_iterator
            iter = views.begin(); iter != views.end(); ++iter) {
     if ((*iter)->IsVisible()) {
       scoped_nsobject<AutocompleteTextFieldIcon> icon(
           [[AutocompleteTextFieldIcon alloc] initImageWithView:*iter]);
       [result addObject:icon];
     }
   }
 
@@ skipping 53 matching lines @@
       icon = [self iconForEvent:theEvent inRect:cellFrame ofView:controlView];
   if (icon) {
     [icon view]->OnMousePressed([icon rect]);
     return YES;
   }
 
   return NO;
 }
 
 @end