chrome: rename more wrench/Wrench occurrencies to appMenu/AppMenu

chrome/browser/ui/cocoa/toolbar/toolbar_controller.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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 70 matching lines @@
 const CGFloat kLocationBarHeight = 29.0;
 
 // The padding above the toolbar elements. This is calculated from the values
 // in Toolbar.xib: the height of the toolbar (35) minus the height of the child
 // elements (29) minus the y-origin of the elements (4).
 const CGFloat kToolbarElementTopPadding = 2.0;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
-// The amount of left padding that the wrench menu should have.
-const CGFloat kWrenchMenuLeftPadding = 3.0;
+// The amount of left padding that the app menu should have.
+const CGFloat kAppMenuLeftPadding = 3.0;
 
 class BrowserActionsContainerDelegate :
     public BrowserActionsContainerViewSizeDelegate {
  public:
   BrowserActionsContainerDelegate(
       AutocompleteTextField* location_bar,
       BrowserActionsContainerView* browser_actions_container_view);
   ~BrowserActionsContainerDelegate() override;
 
  private:
@@ skipping 35 matching lines @@
 - (ToolbarView*)toolbarView;
 - (void)toolbarFrameChanged;
 - (void)showLocationBarOnly;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
-- (void)updateWrenchButtonSeverity:(AppMenuIconPainter::Severity)severity
-                           animate:(BOOL)animate;
+- (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
+                            animate:(BOOL)animate;
 @end
 
 namespace ToolbarControllerInternal {
 
 // A C++ bridge class that handles listening for updates to commands and
 // passing them back to ToolbarController. ToolbarController will create one of
 // these bridges, pass them to CommandUpdater::AddCommandObserver, and then wait
 // for update notifications, delivered via
 // -enabledStateChangedForCommand:enabled:.
 class CommandObserverBridge : public CommandObserver {
@@ skipping 26 matching lines @@
   }
   ~NotificationBridge() override {}
 
   void UpdateBadgeSeverity() {
     badge_controller_.UpdateDelegate();
   }
 
   void UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
                            AppMenuIconPainter::Severity severity,
                            bool animate) override {
-    [controller_ updateWrenchButtonSeverity:severity animate:animate];
+    [controller_ updateAppMenuButtonSeverity:severity animate:animate];
   }
 
   void OnPreferenceChanged(const std::string& pref_name) {
     [controller_ prefChanged:pref_name];
   }
 
  private:
   ToolbarController* controller_;  // weak, owns us
 
   AppMenuBadgeController badge_controller_;
@@ skipping 84 matching lines @@
   [[reloadButton_ cell] setImageID:IDR_RELOAD_P
                     forButtonState:image_button_cell::kPressedState];
 
   [[homeButton_ cell] setImageID:IDR_HOME
                   forButtonState:image_button_cell::kDefaultState];
   [[homeButton_ cell] setImageID:IDR_HOME_H
                   forButtonState:image_button_cell::kHoverState];
   [[homeButton_ cell] setImageID:IDR_HOME_P
                   forButtonState:image_button_cell::kPressedState];
 
-  [[wrenchButton_ cell] setImageID:IDR_TOOLS
-                    forButtonState:image_button_cell::kDefaultState];
-  [[wrenchButton_ cell] setImageID:IDR_TOOLS_H
-                    forButtonState:image_button_cell::kHoverState];
-  [[wrenchButton_ cell] setImageID:IDR_TOOLS_P
-                    forButtonState:image_button_cell::kPressedState];
+  [[appMenuButton_ cell] setImageID:IDR_TOOLS
+                     forButtonState:image_button_cell::kDefaultState];
+  [[appMenuButton_ cell] setImageID:IDR_TOOLS_H
+                     forButtonState:image_button_cell::kHoverState];
+  [[appMenuButton_ cell] setImageID:IDR_TOOLS_P
+                     forButtonState:image_button_cell::kPressedState];
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
   notificationBridge_->UpdateBadgeSeverity();
 
-  [wrenchButton_ setOpenMenuOnClick:YES];
+  [appMenuButton_ setOpenMenuOnClick:YES];
 
   [backButton_ setOpenMenuOnRightClick:YES];
   [forwardButton_ setOpenMenuOnRightClick:YES];
 
   [backButton_ setHandleMiddleClick:YES];
   [forwardButton_ setHandleMiddleClick:YES];
   [reloadButton_ setHandleMiddleClick:YES];
   [homeButton_ setHandleMiddleClick:YES];
 
   [self initCommandStatus:commands_];
   [reloadButton_ setCommandUpdater:commands_];
 
   locationBarView_.reset(new LocationBarViewMac(locationBar_, commands_,
                                                 profile_, browser_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
 
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar based on those prefs.
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(
       prefs::kShowHomeButton, prefs,
       base::Bind(
           &ToolbarControllerInternal::NotificationBridge::OnPreferenceChanged,
           base::Unretained(notificationBridge_.get())));
   [self showOptionalHomeButton];
-  [self installWrenchMenu];
+  [self installAppMenu];
 
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 
   // Create the controllers for the back/forward menus.
   backMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_BACK
                    button:backButton_]);
   forwardMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
@@ skipping 19 matching lines @@
          selector:@selector(toolbarFrameChanged)
              name:NSViewFrameDidChangeNotification
            object:toolbarView];
 
   // Set ViewIDs for toolbar elements which don't have their dedicated class.
   // ViewIDs of |toolbarView|, |reloadButton_|, |locationBar_| and
   // |browserActionsContainerView_| are handled by themselves.
   view_id_util::SetID(backButton_, VIEW_ID_BACK_BUTTON);
   view_id_util::SetID(forwardButton_, VIEW_ID_FORWARD_BUTTON);
   view_id_util::SetID(homeButton_, VIEW_ID_HOME_BUTTON);
-  view_id_util::SetID(wrenchButton_, VIEW_ID_APP_MENU);
+  view_id_util::SetID(appMenuButton_, VIEW_ID_APP_MENU);
 
   [self addAccessibilityDescriptions];
 }
 
 - (void)dealloc {
   [self cleanUp];
   [super dealloc];
 }
 
 - (void)browserWillBeDestroyed {
@@ skipping 11 matching lines @@
   [self cleanUp];
 }
 
 - (void)cleanUp {
   // Unset ViewIDs of toolbar elements.
   // ViewIDs of |toolbarView|, |reloadButton_|, |locationBar_| and
   // |browserActionsContainerView_| are handled by themselves.
   view_id_util::UnsetID(backButton_);
   view_id_util::UnsetID(forwardButton_);
   view_id_util::UnsetID(homeButton_);
-  view_id_util::UnsetID(wrenchButton_);
+  view_id_util::UnsetID(appMenuButton_);
 
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
   hasToolbar_ = YES;
   hasLocationBar_ = YES;
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   if (trackingArea_.get()) {
     [[self view] removeTrackingArea:trackingArea_.get()];
@@ skipping 33 matching lines @@
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_HOME);
   [[homeButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_LOCATION);
   [[locationBar_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_APP);
-  [[wrenchButton_ cell]
+  [[appMenuButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [[hoveredButton_ cell] setIsMouseInside:NO];
   [hoveredButton_ release];
   hoveredButton_ = nil;
 }
 
@@ skipping 144 matching lines @@
           setBackgroundColor:[locationBar_ backgroundColor]];
     }
     return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
 
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
-             homeButton_, wrenchButton_, locationBar_,
-             browserActionsContainerView_, nil];
+                                   homeButton_, appMenuButton_, locationBar_,
+                                   browserActionsContainerView_, nil];
 }
 
 // Moves |rect| to the right by |delta|, keeping the right side fixed by
 // shrinking the width to compensate. Passing a negative value for |deltaX|
 // moves to the left and increases the width.
 - (NSRect)adjustRect:(NSRect)rect byAmount:(CGFloat)deltaX {
   NSRect frame = NSOffsetRect(rect, deltaX, 0);
   frame.size.width -= deltaX;
   return frame;
 }
@@ skipping 12 matching lines @@
   // hiding the button, reverse the direction of the movement (to the left).
   CGFloat moveX = [homeButton_ frame].size.width - 1.0;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
-// Install the menu wrench buttons. Calling this repeatedly is inexpensive so it
+// Install the app menu buttons. Calling this repeatedly is inexpensive so it
 // can be done every time the buttons are shown.
-- (void)installWrenchMenu {
+- (void)installAppMenu {
   if (appMenuController_.get())
     return;
 
   appMenuController_.reset(
       [[AppMenuController alloc] initWithBrowser:browser_]);
   [appMenuController_ setUseWithPopUpButtonCell:YES];
-  [wrenchButton_ setAttachedMenu:[appMenuController_ menu]];
+  [appMenuButton_ setAttachedMenu:[appMenuController_ menu]];
 }
 
-- (void)updateWrenchButtonSeverity:(AppMenuIconPainter::Severity)severity
-                           animate:(BOOL)animate {
+- (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
+                            animate:(BOOL)animate {
   AppToolbarButtonCell* cell =
-      base::mac::ObjCCastStrict<AppToolbarButtonCell>([wrenchButton_ cell]);
+      base::mac::ObjCCastStrict<AppToolbarButtonCell>([appMenuButton_ cell]);
   [cell setSeverity:severity shouldAnimate:animate];
 }
 
 - (void)prefChanged:(const std::string&)prefName {
   if (prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
@@ skipping 62 matching lines @@
 
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
   CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
   CGFloat leftDistance = 0.0;
 
   if ([browserActionsContainerView_ isHidden]) {
-    CGFloat edgeXPos = [wrenchButton_ frame].origin.x;
-    leftDistance = edgeXPos - locationBarXPos - kWrenchMenuLeftPadding;
+    CGFloat edgeXPos = [appMenuButton_ frame].origin.x;
+    leftDistance = edgeXPos - locationBarXPos - kAppMenuLeftPadding;
   } else {
     leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
         locationBarXPos;
   }
   if (leftDistance != 0.0)
     [self adjustLocationSizeBy:leftDistance animate:animate];
   else
     [locationBar_ stopAnimation];
 }
 
@@ skipping 55 matching lines @@
       containerFrame = NSOffsetRect(containerFrame,
           NSWidth(containerFrame) - savedContainerWidth, 0);
       containerFrame.size.width = savedContainerWidth;
       [browserActionsContainerView_ setGrippyPinned:NO];
     }
     [browserActionsContainerView_ setFrame:containerFrame];
     [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
   }
 }
 
-// Hide the back, forward, reload, home, and wrench buttons of the toolbar.
+// Hide the back, forward, reload, home, and app menu buttons of the toolbar.
 // This allows the location bar to occupy the entire width. There is no way to
 // undo this operation, and once it is called, no other programmatic changes
 // to the toolbar or location bar width should be made. This message is
 // invalid if the toolbar is shown or the location bar is hidden.
 - (void)showLocationBarOnly {
   // -showLocationBarOnly is only ever called once, shortly after
   // initialization, so the regular buttons should all be visible.
   DCHECK(!hasToolbar_ && hasLocationBar_);
   DCHECK(![backButton_ isHidden]);
 
   // Ensure the location bar fills the toolbar.
   NSRect toolbarFrame = [[self view] frame];
   toolbarFrame.size.height = kLocationBarHeight;
   [[self view] setFrame:toolbarFrame];
 
   [locationBar_ setFrame:NSMakeRect(0, 0, NSWidth([[self view] frame]),
                                     kLocationBarHeight)];
 
   [backButton_ setHidden:YES];
   [forwardButton_ setHidden:YES];
   [reloadButton_ setHidden:YES];
-  [wrenchButton_ setHidden:YES];
+  [appMenuButton_ setHidden:YES];
   [homeButton_ setHidden:YES];
 }
 
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate {
   // Ensure that the location bar is in its proper place.
   NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
 
   [locationBar_ stopAnimation];
 
   if (animate)
     [locationBar_ animateToFrame:locationFrame];
   else
     [locationBar_ setFrame:locationFrame];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   if (locationBarView_->IsStarEnabled())
     return locationBarView_->GetBookmarkBubblePoint();
 
   // Grab bottom middle of hotdogs.
-  NSRect frame = wrenchButton_.frame;
+  NSRect frame = appMenuButton_.frame;
   NSPoint point = NSMakePoint(NSMidX(frame), NSMinY(frame));
   // Inset to account for the whitespace around the hotdogs.
   point.y += app_menu_controller::kAppMenuBubblePointOffsetY;
   return [self.view convertPoint:point toView:nil];
 }
 
 - (NSPoint)managePasswordsBubblePoint {
   return locationBarView_->GetManagePasswordsBubblePoint();
 }
 
@@ skipping 13 matching lines @@
   ToolbarView* toolbarView = [self toolbarView];
   [toolbarView setShowsDivider:(opacity > 0 ? YES : NO)];
   [toolbarView setDividerOpacity:opacity];
   [toolbarView setNeedsDisplay:YES];
 }
 
 - (BrowserActionsController*)browserActionsController {
   return browserActionsController_.get();
 }
 
-- (NSView*)wrenchButton {
-  return wrenchButton_;
+- (NSView*)appMenuButton {
+  return appMenuButton_;
 }
 
 - (AppMenuController*)appMenuController {
   return appMenuController_.get();
 }
 
 // (URLDropTargetController protocol)
 - (void)dropURLs:(NSArray*)urls inView:(NSView*)view at:(NSPoint)point {
   // TODO(viettrungluu): This code is more or less copied from the code in
   // |TabStripController|. I'll refactor this soon to make it common and expand
@@ skipping 47 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end