Unify the page and wrench menus into one wrench menu. Remove pref to hide men...

chrome/browser/cocoa/toolbar_controller.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_TOOLBAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/command_observer_bridge.h"
 #import "chrome/browser/cocoa/delayedmenu_button.h"
 #import "chrome/browser/cocoa/url_drop_target.h"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/browser/pref_member.h"
 
-class AppMenuModel;
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
 @class BrowserActionsContainerView;
 @class BackForwardMenuController;
 class Browser;
 @class BrowserActionsController;
 class CommandUpdater;
 @class DelayedMenuButton;
 class LocationBar;
 class LocationBarViewMac;
 @class MenuButton;
 @class MenuController;
-class PageMenuModel;
 namespace ToolbarControllerInternal {
 class MenuDelegate;
 class PrefObserverBridge;
 }
 class Profile;
 class TabContents;
 class ToolbarModel;
+class WrenchMenuModel;
 
 // A controller for the toolbar in the browser window. Manages
 // updating the state for location bar and back/fwd/reload/go buttons.
 // Manages the bookmark bar and its position in the window relative to
 // the web content view.
 
 @interface ToolbarController : NSViewController<CommandObserverProtocol,
                                                 URLDropTargetController> {
  @protected
   // 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 MenuButton* pageButton_;
   IBOutlet MenuButton* wrenchButton_;
   IBOutlet AutocompleteTextField* locationBar_;
   IBOutlet BrowserActionsContainerView* browserActionsContainerView_;
 
  @private
   ToolbarModel* toolbarModel_;  // weak, one per window
   CommandUpdater* commands_;  // weak, one per window
   Profile* profile_;  // weak, one per window
   Browser* browser_;  // weak, one per window
   scoped_ptr<CommandObserverBridge> commandObserver_;
   scoped_ptr<LocationBarViewMac> locationBarView_;
   scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
   id<ViewResizer> resizeDelegate_;  // weak
   scoped_nsobject<BackForwardMenuController> backMenuController_;
   scoped_nsobject<BackForwardMenuController> forwardMenuController_;
   scoped_nsobject<BrowserActionsController> browserActionsController_;
 
   // Lazily-instantiated model, controller, and delegate for the menu on the
-  // page and wrench buttons. The wrench menu is also called the "app menu". If
-  // it's visible, these will be non-null, but they are not reaped when the
-  // button is hidden once it is initially shown.
-  scoped_ptr<PageMenuModel> pageMenuModel_;
-  scoped_nsobject<MenuController> pageMenuController_;
+  // wrench button.  Once visible, it will be non-null, but will not
+  // reaped when the menu is hidden once it is initially shown.
   scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
-  scoped_ptr<AppMenuModel> appMenuModel_;
-  scoped_nsobject<MenuController> appMenuController_;
+  scoped_ptr<WrenchMenuModel> wrenchMenuModel_;
+  scoped_nsobject<MenuController> wrenchMenuController_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember showPageOptionButtons_;
   BOOL hasToolbar_;  // If NO, we may have only the location bar.
   BOOL hasLocationBar_;  // If |hasToolbar_| is YES, this must also be YES.
   BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
 
   // We have an extra retain in the locationBar_.
@@ skipping 81 matching lines @@
             browser:(Browser*)browser
      resizeDelegate:(id<ViewResizer>)resizeDelegate
        nibFileNamed:(NSString*)nibName;
 @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;
+- (void)installWrenchMenu;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_