Make a shared app menu model and update win and mac to use it. Remove the NSM...

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"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/command_observer_bridge.h"
 #import "chrome/browser/cocoa/delayedmenu_button.h"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/common/pref_member.h"
 
+class AppMenuModel;
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
 @class BackForwardMenuController;
 class Browser;
 @class BrowserActionsController;
 class BubblePositioner;
 class CommandUpdater;
 @class DelayedMenuButton;
 class LocationBar;
 class LocationBarViewMac;
@@ skipping 22 matching lines @@
   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 button. If it's visible, these will be non-null, but they are not
-  // reaped when the button is hidden once it is initially shown.
+  // 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_;
-  scoped_ptr<ToolbarControllerInternal::MenuDelegate> pageMenuDelegate_;
+  scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
+  scoped_ptr<AppMenuModel> appMenuModel_;
+  scoped_nsobject<MenuController> appMenuController_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
   // Used to position the omnibox bubble.
   scoped_ptr<BubblePositioner> bubblePositioner_;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember showPageOptionButtons_;
   BOOL hasToolbar_;  // if NO, we only have the location bar.
 
   // We have an extra retain in the locationBar_.
@@ skipping 84 matching lines @@
 - (NSArray*)toolbarViews;
 - (void)showOptionalHomeButton;
 - (void)showOptionalPageWrenchButtons;
 - (gfx::Rect)locationStackBounds;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 - (BrowserActionsController*)browserActionsController;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_