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

chrome/browser/cocoa/toolbar_controller.h

 // Copyright (c) 2009 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_TOOLBAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
@@ skipping 81 matching lines @@
   // setMouseInside:animate:.
   NSButton* hoveredButton_;
 
   // The ordering is important for unit tests. If new items are added or the
   // ordering is changed, make sure to update |-toolbarViews| and the
   // corresponding enum in the unit tests.
   IBOutlet DelayedMenuButton* backButton_;
   IBOutlet DelayedMenuButton* forwardButton_;
   IBOutlet NSButton* reloadButton_;
   IBOutlet NSButton* homeButton_;
-  IBOutlet NSButton* starButton_;
   IBOutlet NSButton* goButton_;
   IBOutlet MenuButton* pageButton_;
   IBOutlet MenuButton* wrenchButton_;
   IBOutlet AutocompleteTextField* locationBar_;
   IBOutlet BrowserActionsContainerView* browserActionsContainerView_;
 }
 
 // Initialize the toolbar and register for command updates. The profile is
 // needed for initializing the location bar. The browser is needed for
 // initializing the back/forward menus.
@@ skipping 27 matching lines @@
 
 // Called to update the loading state. Handles updating the go/stop button
 // state.
 - (void)setIsLoading:(BOOL)isLoading;
 
 // Allow turning off the toolbar (but we may keep the location bar without a
 // surrounding toolbar). If |toolbar| is YES, the value of |hasLocationBar| is
 // ignored. This changes the behavior of other methods, like |-view|.
 - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar;
 
-// The bookmark bubble (when you click the star) needs to know where to go.
-// Somewhere near the star button seems like a good start.
-- (NSRect)starButtonInWindowCoordinates;
+// The bookmark bubble (when you click the star or hit Command-d)
+// needs to know where to go.  Somewhere near the star icon seems like
+// a good start.
+- (NSRect)starIconInWindowCoordinates;
 
 // Returns the desired toolbar height for the given compression factor.
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight;
 
 // Set the opacity of the divider (the line at the bottom) *if* we have a
 // |ToolbarView| (0 means don't show it); no-op otherwise.
 - (void)setDividerOpacity:(CGFloat)opacity;
 
 // Create and add the Browser Action buttons to the toolbar view.
 - (void)createBrowserActionButtons;
 
 // Return the BrowserActionsController for this toolbar.
 - (BrowserActionsController*)browserActionsController;
 @end
 
 // A set of private methods used by tests, in the absence of "friends" in ObjC.
 @interface ToolbarController(PrivateTestMethods)
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews;
 - (void)showOptionalHomeButton;
 - (void)showOptionalPageWrenchButtons;
 - (gfx::Rect)locationStackBounds;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_