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

chrome/browser/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_menu_model.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/bubble_positioner.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
@@ skipping 442 matching lines @@
   [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;
-  pageMenuDelegate_.reset(
-      new ToolbarControllerInternal::MenuDelegate(browser_));
-  pageMenuModel_.reset(new PageMenuModel(pageMenuDelegate_.get(), browser_));
+  menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_));
+  pageMenuModel_.reset(new PageMenuModel(menuDelegate_.get(), browser_));
   pageMenuController_.reset(
       [[MenuController alloc] initWithModel:pageMenuModel_.get()
-                              useWithPopUpButtonCell:YES]);
+                     useWithPopUpButtonCell:YES]);
   [pageButton_ setAttachedMenu:[pageMenuController_ menu]];
+
+  appMenuModel_.reset(new AppMenuModel(menuDelegate_.get(), browser_));
+  appMenuController_.reset(
+      [[MenuController alloc] initWithModel:appMenuModel_.get()
+                     useWithPopUpButtonCell:YES]);
+  [wrenchButton_ setAttachedMenu:[appMenuController_ menu]];
 }
 
 // Show or hide the page and wrench buttons based on the pref.
 - (void)showOptionalPageWrenchButtons {
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   DCHECK([pageButton_ isHidden] == [wrenchButton_ isHidden]);
   BOOL hide = showPageOptionButtons_.GetValue() ? NO : YES;
   if (!hide)
@@ skipping 167 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end