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

chrome/browser/cocoa/toolbar_controller.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/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 33 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Names of images in the bundle for buttons.
 NSString* const kBackButtonImageName = @"back_Template.pdf";
 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
 NSString* const kReloadButtonImageName = @"reload_Template.pdf";
 NSString* const kHomeButtonImageName = @"home_Template.pdf";
-NSString* const kStarButtonImageName = @"star_Template.pdf";
-NSString* const kStarButtonFillingImageName = @"starred.pdf";
 NSString* const kGoButtonGoImageName = @"go_Template.pdf";
 NSString* const kGoButtonStopImageName = @"stop_Template.pdf";
 NSString* const kPageButtonImageName = @"menu_page_Template.pdf";
 NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
 const CGFloat kBaseToolbarHeight = 36.0;
 
 // The distance from the 'Go' button to the Browser Actions container in pixels.
 const CGFloat kBrowserActionsContainerLeftPadding = 5.0;
@@ skipping 152 matching lines @@
 // bar and button state.
 - (void)awakeFromNib {
   // A bug in AppKit (<rdar://7298597>, <http://openradar.me/7298597>) causes
   // images loaded directly from nibs in a framework to not get their "template"
   // flags set properly. Thus, despite the images being set on the buttons in
   // the xib, we must set them in code.
   [backButton_ setImage:nsimage_cache::ImageNamed(kBackButtonImageName)];
   [forwardButton_ setImage:nsimage_cache::ImageNamed(kForwardButtonImageName)];
   [reloadButton_ setImage:nsimage_cache::ImageNamed(kReloadButtonImageName)];
   [homeButton_ setImage:nsimage_cache::ImageNamed(kHomeButtonImageName)];
-  [starButton_ setImage:nsimage_cache::ImageNamed(kStarButtonImageName)];
   [goButton_ setImage:nsimage_cache::ImageNamed(kGoButtonGoImageName)];
   [pageButton_ setImage:nsimage_cache::ImageNamed(kPageButtonImageName)];
   [wrenchButton_ setImage:nsimage_cache::ImageNamed(kWrenchButtonImageName)];
 
   [pageButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [wrenchButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
   [self initCommandStatus:commands_];
   bubblePositioner_.reset(new BubblePositionerMac(self));
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
@@ skipping 66 matching lines @@
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_RELOAD);
   [[reloadButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_HOME);
   [[homeButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
-  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_STAR);
-  [[starButton_ cell]
-      accessibilitySetOverrideValue:description
-                       forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_LOCATION);
   [[locationBar_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_GO);
   [[goButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_PAGE);
   [[pageButton_ cell]
@@ skipping 58 matching lines @@
       break;
     case IDC_FORWARD:
       button = forwardButton_;
       break;
     case IDC_RELOAD:
       button = reloadButton_;
       break;
     case IDC_HOME:
       button = homeButton_;
       break;
-    case IDC_BOOKMARK_PAGE:
-      button = starButton_;
-      break;
   }
   [button setEnabled:enabled];
 }
 
 // Init the enabled state of the buttons on the toolbar to match the state in
 // the controller.
 - (void)initCommandStatus:(CommandUpdater*)commands {
   [backButton_ setEnabled:commands->IsCommandEnabled(IDC_BACK) ? YES : NO];
   [forwardButton_
       setEnabled:commands->IsCommandEnabled(IDC_FORWARD) ? YES : NO];
   [reloadButton_ setEnabled:commands->IsCommandEnabled(IDC_RELOAD) ? YES : NO];
   [homeButton_ setEnabled:commands->IsCommandEnabled(IDC_HOME) ? YES : NO];
-  [starButton_
-      setEnabled:commands->IsCommandEnabled(IDC_BOOKMARK_PAGE) ? YES : NO];
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
   locationBarView_->Update(tab, shouldRestore ? true : false);
 
   [locationBar_ updateCursorAndToolTipRects];
 
   if (browserActionsController_.get()) {
     [browserActionsController_ update];
   }
 }
 
 - (void)setStarredState:(BOOL)isStarred {
-  NSImage* starImage = nil;
-  NSString* toolTip;
-  if (isStarred) {
-    starImage = nsimage_cache::ImageNamed(kStarButtonFillingImageName);
-    // Cache the string since we'll need it a lot
-    static NSString* starredToolTip =
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain];
-    toolTip = starredToolTip;
-  } else {
-    // Cache the string since we'll need it a lot
-    static NSString* starToolTip =
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain];
-    toolTip = starToolTip;
-  }
-
-  [(GradientButtonCell*)[starButton_ cell] setUnderlayImage:starImage];
-  [starButton_ setToolTip:toolTip];
+  locationBarView_->SetStarred(isStarred ? true : false);
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
   NSString* imageName = kGoButtonGoImageName;
   NSInteger tag = IDC_GO;
   if (isLoading) {
     imageName = kGoButtonStopImageName;
     tag = IDC_STOP;
   }
   NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName);
@@ skipping 46 matching lines @@
     DCHECK(autocompleteTextFieldEditor_.get());
     [autocompleteTextFieldEditor_.get() setFieldEditor:YES];
     return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
 
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
-            homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
+            homeButton_, goButton_, pageButton_, wrenchButton_,
             locationBar_, browserActionsContainerView_, nil];
 }
 
 // Moves |rect| to the right by |delta|, keeping the right side fixed by
 // shrinking the width to compensate. Passing a negative value for |deltaX|
 // moves to the left and increases the width.
 - (NSRect)adjustRect:(NSRect)rect byAmount:(CGFloat)deltaX {
   NSRect frame = NSOffsetRect(rect, deltaX, 0);
   frame.size.width -= deltaX;
   return frame;
 }
 
-// Computes the padding between the buttons that should have a separation from
-// the positions in the nib. Since the forward and reload buttons are always
-// visible, we use those buttons as the canonical spacing.
+// Computes the padding between the buttons that should have a
+// separation from the positions in the nib.  |homeButton_| is right
+// of |forwardButton_| unless it has been hidden, in which case
+// |reloadButton_| is in that spot.
 - (CGFloat)interButtonSpacing {
-  NSRect forwardFrame = [forwardButton_ frame];
-  NSRect reloadFrame = [reloadButton_ frame];
-  DCHECK(NSMinX(reloadFrame) > NSMaxX(forwardFrame));
-  return NSMinX(reloadFrame) - NSMaxX(forwardFrame);
+  const NSRect forwardFrame = [forwardButton_ frame];
+  NSButton* nextButton = [homeButton_ isHidden] ? reloadButton_ : homeButton_;
+  const NSRect nextButtonFrame = [nextButton frame];
+  DCHECK_GT(NSMinX(nextButtonFrame), NSMaxX(forwardFrame));
+  return NSMinX(nextButtonFrame) - NSMaxX(forwardFrame);
 }
 
 // Show or hide the home button based on the pref.
 - (void)showOptionalHomeButton {
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   BOOL hide = showHomeButton_.GetValue() ? NO : YES;
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the star and text field by the width of the home button plus
   // the appropriate gap width. If we're hiding the button, we have to
   // reverse the direction of the movement (to the left).
   CGFloat moveX = [self interButtonSpacing] + [homeButton_ frame].size.width;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
-  [starButton_ setFrame:NSOffsetRect([starButton_ frame], moveX, 0)];
+  [reloadButton_ setFrame:NSOffsetRect([reloadButton_ frame], moveX, 0)];
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Lazily install the menus on the page and wrench buttons. Calling this
 // repeatedly is inexpensive so it can be done every time the buttons are shown.
 - (void)installPageWrenchMenus {
   if (pageMenuModel_.get())
     return;
@@ skipping 202 matching lines @@
     return;
   }
 
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext] setDuration:kAnimationDuration];
   [[goButton_ animator] setFrame:goFrame];
   [[locationBar_ animator] setFrame:locationFrame];
   [NSAnimationContext endGrouping];
 }
 
-- (NSRect)starButtonInWindowCoordinates {
-  return [starButton_ convertRect:[starButton_ bounds] toView:nil];
+- (NSRect)starIconInWindowCoordinates {
+  return [locationBar_ convertRect:[locationBar_ starIconFrame] toView:nil];
 }
 
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
   // With no toolbar, just ignore the compression.
   return hasToolbar_ ? kBaseToolbarHeight - compressByHeight :
                        NSHeight([locationBar_ frame]);
 }
 
 - (void)setDividerOpacity:(CGFloat)opacity {
   BackgroundGradientView* view = [self backgroundGradientView];
@@ skipping 100 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end