cocoa browser: remove non-MD location bar support

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 61 matching lines @@
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 // Duration of the toolbar animation.
 const NSTimeInterval kToolBarAnimationDuration = 0.12;
 
-// The height of the location bar in Material Design.
-const CGFloat kMaterialDesignLocationBarHeight = 28;
+// The height of the location bar.
+const CGFloat kLocationBarHeight = 28;
 
 // The padding between the top of the toolbar and the top of the
 // location bar.
-const CGFloat kMaterialDesignLocationBarPadding = 2;
+const CGFloat kLocationBarPadding = 2;
 
-// The padding between Material Design elements and the edges of the toolbar.
-const CGFloat kMaterialDesignElementPadding = 4;
+// The padding between elements and the edges of the toolbar.
+const CGFloat kElementPadding = 4;
 
 // Toolbar buttons are 24x24 and centered in a 28x28 space, so there is a 2pt-
 // wide inset.
-const CGFloat kMaterialDesignButtonInset = 2;
+const CGFloat kButtonInset = 2;
 
 // The y-offset of the browser actions container from the location bar.
-const CGFloat kMaterialDesignContainerYOffset = 2;
+const CGFloat kContainerYOffset = 2;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
 class BrowserActionsContainerDelegate :
     public BrowserActionsContainerViewSizeDelegate {
  public:
   BrowserActionsContainerDelegate(
       AutocompleteTextField* location_bar,
       BrowserActionsContainerView* browser_actions_container_view);
@@ skipping 115 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(NotificationBridge);
 };
 
 }  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 @synthesize browser = browser_;
 
 + (CGFloat)locationBarHeight {
-  return kMaterialDesignLocationBarHeight;
+  return kLocationBarHeight;
 }
 
 + (CGFloat)appMenuLeftPadding {
-  return kMaterialDesignElementPadding;
+  return kElementPadding;
 }
 
 + (CGFloat)materialDesignButtonInset {
-  return kMaterialDesignButtonInset;
+  return kButtonInset;
 }
 
 - (id)initWithCommands:(CommandUpdater*)commands
                profile:(Profile*)profile
                browser:(Browser*)browser
         resizeDelegate:(id<ViewResizer>)resizeDelegate {
   DCHECK(commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:base::mac::FrameworkBundle()])) {
     commands_ = commands;
@@ skipping 46 matching lines @@
   NSRect toolbarBounds = [toolbarView bounds];
   NSSize toolbarButtonSize = [ToolbarButton toolbarButtonSize];
 
   // Set the toolbar height.
   NSRect frame = [toolbarView frame];
   frame.size.height = [self baseToolbarHeight];
   [toolbarView setFrame:frame];
 
   NSRect backButtonFrame = [backButton_ frame];
   backButtonFrame.origin.x =
-      kMaterialDesignElementPadding + kMaterialDesignButtonInset;
+      kElementPadding + kButtonInset;

[Avi (use Gerrit), 2016/09/28 16:01:58]

Some of these can be rewrapped. Try a clang format on it.

[Elly Fong-Jones, 2016/09/28 19:02:27]

Done.

   backButtonFrame.origin.y = NSMaxY(toolbarBounds) -
-      kMaterialDesignElementPadding - toolbarButtonSize.height;
+      kElementPadding - toolbarButtonSize.height;
   backButtonFrame.size = toolbarButtonSize;
   [backButton_ setFrame:backButtonFrame];
 
   NSRect forwardButtonFrame = [forwardButton_ frame];
   forwardButtonFrame.origin.x =
-      NSMaxX(backButtonFrame) + 2 * kMaterialDesignButtonInset;
+      NSMaxX(backButtonFrame) + 2 * kButtonInset;
   forwardButtonFrame.origin.y = backButtonFrame.origin.y;
   forwardButtonFrame.size = toolbarButtonSize;
   [forwardButton_ setFrame:forwardButtonFrame];
 
   NSRect reloadButtonFrame = [reloadButton_ frame];
   reloadButtonFrame.origin.x =
-      NSMaxX(forwardButtonFrame) + 2 * kMaterialDesignButtonInset;
+      NSMaxX(forwardButtonFrame) + 2 * kButtonInset;
   reloadButtonFrame.origin.y = forwardButtonFrame.origin.y;
   reloadButtonFrame.size = toolbarButtonSize;
   [reloadButton_ setFrame:reloadButtonFrame];
 
   NSRect homeButtonFrame = [homeButton_ frame];
   homeButtonFrame.origin.x =
-      NSMaxX(reloadButtonFrame) + 2 * kMaterialDesignButtonInset;
+      NSMaxX(reloadButtonFrame) + 2 * kButtonInset;
   homeButtonFrame.origin.y = reloadButtonFrame.origin.y;
   homeButtonFrame.size = toolbarButtonSize;
   [homeButton_ setFrame:homeButtonFrame];
 
   // Replace the app button from the nib with an AppToolbarButton instance for
   // Material Design.
   AppToolbarButton* newMenuButton =
       [[[AppToolbarButton alloc] initWithFrame:[appMenuButton_ frame]]
           autorelease];
   [newMenuButton setAutoresizingMask:[appMenuButton_ autoresizingMask]];
   [[appMenuButton_ superview] addSubview:newMenuButton];
   [appMenuButton_ removeFromSuperview];
   appMenuButton_ = newMenuButton;
 
   // Adjust the menu button's position.
   NSRect menuButtonFrame = [appMenuButton_ frame];
   CGFloat menuButtonFrameMaxX =
       NSMaxX(toolbarBounds) - [ToolbarController appMenuLeftPadding];
   menuButtonFrame.origin.x =
-      menuButtonFrameMaxX - kMaterialDesignButtonInset -
+      menuButtonFrameMaxX - kButtonInset -
           toolbarButtonSize.width;
   menuButtonFrame.origin.y = homeButtonFrame.origin.y;
   menuButtonFrame.size = toolbarButtonSize;
   [appMenuButton_ setFrame:menuButtonFrame];
 
   // Adjust the size and location on the location bar to take up the
   // space between the reload and menu buttons.
   NSRect locationBarFrame = [locationBar_ frame];
   locationBarFrame.origin.x = NSMaxX(homeButtonFrame) +
-      kMaterialDesignButtonInset;
+      kButtonInset;
   if (![homeButton_ isHidden]) {
     // Ensure proper spacing between the home button and the location bar.
-    locationBarFrame.origin.x += kMaterialDesignElementPadding;
+    locationBarFrame.origin.x += kElementPadding;
   }
   locationBarFrame.origin.y = NSMaxY(toolbarBounds) -
-      kMaterialDesignLocationBarPadding - kMaterialDesignLocationBarHeight;
+      kLocationBarPadding - kLocationBarHeight;
   locationBarFrame.size.width =
       menuButtonFrame.origin.x -
           locationBarFrame.origin.x;
-  locationBarFrame.size.height = kMaterialDesignLocationBarHeight;
+  locationBarFrame.size.height = kLocationBarHeight;
   [locationBar_ setFrame:locationBarFrame];
 
   // Correctly position the extension buttons' container view.
   NSRect containerFrame = [browserActionsContainerView_ frame];
-  containerFrame.size.width += kMaterialDesignButtonInset;
+  containerFrame.size.width += kButtonInset;
   containerFrame.origin.y =
-      locationBarFrame.origin.y + kMaterialDesignContainerYOffset;
+      locationBarFrame.origin.y + kContainerYOffset;
   containerFrame.size.height = toolbarButtonSize.height;
   [browserActionsContainerView_ setFrame:containerFrame];
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
   notificationBridge_->UpdateSeverity();
 
   [appMenuButton_ setOpenMenuOnClick:YES];
 
   [backButton_ setOpenMenuOnRightClick:YES];
@@ skipping 342 matching lines @@
     return;
   BOOL hide = showHomeButton_.GetValue() ? NO : YES;
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the text field by the width of the home button minus one pixel
   // since the frame edges of each button are right on top of each other. When
   // hiding the button, reverse the direction of the movement (to the left).
   CGFloat moveX = [homeButton_ frame].size.width;
   // Ensure proper spacing between the home button and the location bar.
-  moveX += kMaterialDesignElementPadding;
+  moveX += kElementPadding;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Install the app menu buttons. Calling this repeatedly is inexpensive so it
 // can be done every time the buttons are shown.
@@ skipping 95 matching lines @@
 
   if ([browserActionsContainerView_ isHidden]) {
     CGFloat edgeXPos = [appMenuButton_ frame].origin.x;
     leftDistance = edgeXPos - locationBarXPos -
         [ToolbarController appMenuLeftPadding];
   } else {
     leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
         locationBarXPos;
     // Equalize the distance between the location bar and the first extension
     // button, and the distance between the location bar and home/reload button.
-    leftDistance -= kMaterialDesignButtonInset;
+    leftDistance -= kButtonInset;
   }
   if (leftDistance != 0.0)
     [self adjustLocationSizeBy:leftDistance animate:animate];
   else
     [locationBar_ stopAnimation];
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
@@ skipping 11 matching lines @@
 
   if ([browserActionsContainerView_ isAnimating]) {
     // If the browser actions container is animating, we need to stop it first,
     // because the frame it's animating for could be incorrect with the new
     // bounds (if, for instance, the bookmark bar was added).
     // This will advance to the end of the animation, so we also need to adjust
     // it afterwards.
     [browserActionsContainerView_ stopAnimation];
     NSRect containerFrame = [browserActionsContainerView_ frame];
     containerFrame.origin.y =
-        [locationBar_ frame].origin.y + kMaterialDesignContainerYOffset;
+        [locationBar_ frame].origin.y + kContainerYOffset;
     [browserActionsContainerView_ setFrame:containerFrame];
     [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
   }
 
   [self maintainMinimumLocationBarWidth];
 
   if (locationBarAtMinSize_) {
     // Once the grippy is pinned, leave it until it is explicity un-pinned.
     [browserActionsContainerView_ setGrippyPinned:YES];
     NSRect containerFrame = [browserActionsContainerView_ frame];
@@ skipping 188 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end