chrome: Rename WrenchMenuModel to AppMenuModel.

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/bundle_locations.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
+#include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
-#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/ui/zoom/zoom_event_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 // Padding amounts on the left/right of a custom menu item (like the browser
 // actions overflow container).
@@ skipping 51 matching lines @@
       : controller_(controller) {
     subscription_ = manager->AddZoomLevelChangedCallback(
         base::Bind(&ZoomLevelObserver::OnZoomLevelChanged,
                    base::Unretained(this)));
   }
 
   ~ZoomLevelObserver() {}
 
  private:
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change) {
-    WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];
-    wrenchMenuModel->UpdateZoomControls();
+    AppMenuModel* appMenuModel = [controller_ appMenuModel];
+    appMenuModel->UpdateZoomControls();
     const base::string16 level =
-        wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY);
+        appMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY);
     [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)];
   }
 
   scoped_ptr<content::HostZoomMap::Subscription> subscription_;
 
   WrenchMenuController* controller_;  // Weak; owns this.
 
   DISALLOW_COPY_AND_ASSIGN(ZoomLevelObserver);
 };
 
@@ skipping 39 matching lines @@
 - (void)dealloc {
   [self browserWillBeDestroyed];
   [super dealloc];
 }
 
 - (void)browserWillBeDestroyed {
   // This method indicates imminent destruction. Destroy owned objects that hold
   // a weak Browser*, or pass this call onto reference counted objects.
   recentTabsMenuModelDelegate_.reset();
   [self setModel:nullptr];
-  wrenchMenuModel_.reset();
+  appMenuModel_.reset();
   buttonViewController_.reset();
 
   // The observers should most likely already be destroyed (since they're reset
   // in -menuDidClose:), but sometimes shutdown can be funny, so make sure to
   // not leave any dangling observers.
   zoom_level_observer_.reset();
   toolbar_actions_bar_observer_.reset();
 
   [browserActionsController_ browserWillBeDestroyed];
 
@@ skipping 103 matching lines @@
 
 - (NSMenu*)bookmarkSubMenu {
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARKS_MENU);
   return [[[self menu] itemWithTitle:title] submenu];
 }
 
 - (void)updateBookmarkSubMenu {
   NSMenu* bookmarkMenu = [self bookmarkSubMenu];
   DCHECK(bookmarkMenu);
 
-  bookmarkMenuBridge_.reset(
-      new BookmarkMenuBridge([self wrenchMenuModel]->browser()->profile(),
-                             bookmarkMenu));
+  bookmarkMenuBridge_.reset(new BookmarkMenuBridge(
+      [self appMenuModel]->browser()->profile(), bookmarkMenu));
 }
 
 - (void)updateBrowserActionsSubmenu {
   MenuTrackedRootView* view =
       [buttonViewController_ toolbarActionsOverflowItem];
   BrowserActionsContainerView* containerView =
       [buttonViewController_ overflowActionsContainerView];
 
   // Find the preferred container size for the menu width.
   int menuWidth = [[self menu] size].width;
@@ skipping 29 matching lines @@
 
 - (void)menuWillOpen:(NSMenu*)menu {
   [super menuWillOpen:menu];
 
   zoom_level_observer_.reset(
       new WrenchMenuControllerInternal::ZoomLevelObserver(
           self,
           ui_zoom::ZoomEventManager::GetForBrowserContext(
               browser_->profile())));
   NSString* title = base::SysUTF16ToNSString(
-      [self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));
+      [self appMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));
   [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]
       setTitle:title];
   content::RecordAction(UserMetricsAction("ShowAppMenu"));
 
-  NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ?
-      [NSImage imageNamed:NSImageNameExitFullScreenTemplate] :
-          [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
+  NSImage* icon = [self appMenuModel]->browser()->window()->IsFullscreen()
+                      ? [NSImage imageNamed:NSImageNameExitFullScreenTemplate]
+                      : [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
   [[buttonViewController_ zoomFullScreen] setImage:icon];
 }
 
 - (void)menuDidClose:(NSMenu*)menu {
   [super menuDidClose:menu];
   // We don't need to observe changes to zoom or toolbar size when the menu is
   // closed, since we instantiate it with the proper value and recreate the menu
   // on each show. (We do this in -menuNeedsUpdate:, which is called when the
   // menu is about to be displayed at the start of a tracking session.)
   zoom_level_observer_.reset();
@@ skipping 46 matching lines @@
     // to wonky behavior (e.g. http://crbug.com/49716). To avoid this, schedule
     // the dispatch on the outermost run loop.
     [self performSelector:@selector(performCommandDispatch:)
                withObject:[NSNumber numberWithInt:tag]
                afterDelay:0.0];
   }
 }
 
 // Used to perform the actual dispatch on the outermost runloop.
 - (void)performCommandDispatch:(NSNumber*)tag {
-  [self wrenchMenuModel]->ExecuteCommand([tag intValue], 0);
+  [self appMenuModel]->ExecuteCommand([tag intValue], 0);
 }
 
-- (WrenchMenuModel*)wrenchMenuModel {
-  // Don't use |wrenchMenuModel_| so that a test can override the generic one.
-  return static_cast<WrenchMenuModel*>(model_);
+- (AppMenuModel*)appMenuModel {
+  // Don't use |appMenuModel_| so that a test can override the generic one.
+  return static_cast<AppMenuModel*>(model_);
 }
 
 - (void)updateRecentTabsSubmenu {
   ui::MenuModel* model = [self recentTabsMenuModel];
   if (model) {
     recentTabsMenuModelDelegate_.reset(
         new RecentTabsMenuModelDelegate(model, [self recentTabsSubmenu]));
   }
 }
 
 - (BrowserActionsController*)browserActionsController {
   return browserActionsController_.get();
 }
 
 - (void)createModel {
   DCHECK(browser_);
   recentTabsMenuModelDelegate_.reset();
-  wrenchMenuModel_.reset(
-      new WrenchMenuModel(acceleratorDelegate_.get(), browser_));
-  [self setModel:wrenchMenuModel_.get()];
+  appMenuModel_.reset(new AppMenuModel(acceleratorDelegate_.get(), browser_));
+  [self setModel:appMenuModel_.get()];
 
   buttonViewController_.reset(
       [[WrenchMenuButtonViewController alloc] initWithController:self]);
   [buttonViewController_ view];
 
   // See comment in containerSuperviewFrameChanged:.
   NSView* containerSuperview =
       [[buttonViewController_ overflowActionsContainerView] superview];
   [containerSuperview setPostsFrameChangedNotifications:YES];
 }
@@ skipping 66 matching lines @@
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_RECENT_TABS_MENU);
   return [[[self menu] itemWithTitle:title] submenu];
 }
 
 // The recent tabs menu model is recognized by the existence of either the
 // kRecentlyClosedHeaderCommandId or the kDisabledRecentlyClosedHeaderCommandId.
 - (RecentTabsSubMenuModel*)recentTabsMenuModel {
   int index = 0;
   // Start searching at the wrench menu model level, |model| will be updated
   // only if the command we're looking for is found in one of the [sub]menus.
-  ui::MenuModel* model = [self wrenchMenuModel];
+  ui::MenuModel* model = [self appMenuModel];
   if (ui::MenuModel::GetModelAndIndexForCommandId(
           RecentTabsSubMenuModel::kRecentlyClosedHeaderCommandId, &model,
           &index)) {
     return static_cast<RecentTabsSubMenuModel*>(model);
   }
   if (ui::MenuModel::GetModelAndIndexForCommandId(
           RecentTabsSubMenuModel::kDisabledRecentlyClosedHeaderCommandId,
           &model, &index)) {
     return static_cast<RecentTabsSubMenuModel*>(model);
   }
@@ skipping 63 matching lines @@
   // (and thus, after all our ability to adjust it normally). Throw in the
   // towel, and simply don't let the frame move from where it's supposed to be.
   // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround,
   // but unlikely unless we replace the Cocoa menu implementation.
   NSView* containerSuperview = [overflowActionsContainerView_ superview];
   if (NSMinX([containerSuperview frame]) != 0)
     [containerSuperview setFrameOrigin:NSZeroPoint];
 }
 
 @end  // @implementation WrenchMenuButtonViewController