chrome: Rename WrenchMenuController to AppMenuController.

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

 // Copyright (c) 2012 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/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/sys_string_conversions.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/app_menu/app_menu_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
-#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
@@ skipping 75 matching lines @@
 ToolbarActionViewDelegateBridge::~ToolbarActionViewDelegateBridge() {
   viewController_->SetDelegate(nullptr);
 }
 
 void ToolbarActionViewDelegateBridge::ShowContextMenu() {
   // We should only be showing the context menu in this way if we're doing so
   // for an overflowed action.
   DCHECK(![owner_ superview]);
 
   contextMenuRunning_ = true;
-  WrenchMenuController* wrenchMenuController =
+  AppMenuController* appMenuController =
       [[[BrowserWindowController browserWindowControllerForWindow:
           [controller_ browser]->window()->GetNativeWindow()]
-              toolbarController] wrenchMenuController];
-  // If the wrench menu is open, we have to first close it. Part of this happens
+              toolbarController] appMenuController];
+  // If the app menu is open, we have to first close it. Part of this happens
   // asynchronously, so we have to use a posted task to open the next menu.
-  if ([wrenchMenuController isMenuOpen])
-    [wrenchMenuController cancel];
+  if ([appMenuController isMenuOpen])
+    [appMenuController cancel];
 
   [controller_ toolbarActionsBar]->PopOutAction(
       viewController_,
       base::Bind(&ToolbarActionViewDelegateBridge::DoShowContextMenu,
                  weakFactory_.GetWeakPtr()));
 }
 
 content::WebContents* ToolbarActionViewDelegateBridge::GetCurrentWebContents()
     const {
   return [controller_ currentWebContents];
@@ skipping 13 matching lines @@
     user_shown_popup_visible_ = true;
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::OnPopupClosed() {
   user_shown_popup_visible_ = false;
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
-  // The point the menu shows matches that of the normal wrench menu - that is,
-  // the right-left most corner of the menu is left-aligned with the wrench
-  // button, and the menu is displayed "a little bit" lower. It would be nice to
-  // be able to avoid the magic '5' here, but since it's built into Cocoa, it's
-  // not too hopeful.
+  // The point the menu shows matches that of the normal app menu - that is,

[Peter Kasting, 2015/11/06 22:21:28]

Nit: Rewrap comment

+  // the right-left most corner of the menu is left-aligned with the app button,
+  // and the menu is displayed "a little bit" lower. It would be nice to be able
+  // to avoid the magic '5' here, but since it's built into Cocoa, it's not too
+  // hopeful.
   NSPoint menuPoint = NSMakePoint(0, NSHeight([owner_ bounds]) + 5);
   [[owner_ cell] setHighlighted:YES];
   [[owner_ menu] popUpMenuPositioningItem:nil
                                atLocation:menuPoint
                                    inView:owner_];
   [[owner_ cell] setHighlighted:NO];
   contextMenuRunning_ = false;
   // When the menu closed, the ViewController should have popped itself back in.
   DCHECK(![controller_ toolbarActionsBar]->popped_out_action());
 }
@@ skipping 51 matching lines @@
 
   return self;
 }
 
 - (BOOL)acceptsFirstResponder {
   return YES;
 }
 
 - (void)rightMouseDown:(NSEvent*)theEvent {
   // Cocoa doesn't allow menus-running-in-menus, so in order to show the
-  // context menu for an overflowed action, we close the wrench menu and show
-  // the context menu over the wrench (similar to what we do for popups).
-  // Let the main bar's button handle showing the context menu, since the wrench
+  // context menu for an overflowed action, we close the app menu and show

[Peter Kasting, 2015/11/06 22:21:28]

Nit: Rewrap comment

+  // the context menu over the app menu (similar to what we do for popups).
+  // Let the main bar's button handle showing the context menu, since the app
   // menu will close..
   if ([browserActionsController_ isOverflow]) {
     [browserActionsController_ mainButtonForId:viewController_->GetId()]->
         viewControllerDelegate_->ShowContextMenu();
   } else {
     [super rightMouseDown:theEvent];
   }
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
@@ skipping 323 matching lines @@
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end