Revert of [Mac][Material Design] Update bookmarks bar to Material Design.

chrome/browser/ui/cocoa/gradient_button_cell.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.
 
 #include "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 188 matching lines @@
       YES : NO;
 }
 
 #if 1
 // If we are not continuously pulsing, perform a pulse animation to
 // reflect our new state.
 - (void)setMouseInside:(BOOL)flag animate:(BOOL)animated {
   isMouseInside_ = flag;
   if (pulseState_ != gradient_button_cell::kPulsingContinuous) {
     if (animated) {
-      // In Material Design, if the button is already fully on, don't pulse it
-      // on again if the mouse is within its bounds.
-      if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
-          isMouseInside_ && pulseState_ == gradient_button_cell::kPulsedOn) {
-        return;
-      }
-
       [self setPulseState:(isMouseInside_ ? gradient_button_cell::kPulsingOn :
                            gradient_button_cell::kPulsingOff)];
     } else {
       [self setPulseState:(isMouseInside_ ? gradient_button_cell::kPulsedOn :
                            gradient_button_cell::kPulsedOff)];
     }
   }
 }
 #else
 
@@ skipping 93 matching lines @@
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setMouseInside:NO animate:YES];
 }
 
 - (BOOL)isMouseInside {
   return trackingArea_ && isMouseInside_;
 }
 
-- (BOOL)startTrackingAt:(NSPoint)startPoint inView:(NSView *)controlView {
-  if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback) {
-    // The user has just clicked down in the button. In Material Design, set the
-    // pulsed (hover) state to off now so that if the user keeps the mouse held
-    // down while dragging it out of the button's bounds, the button will draw
-    // itself in its normal state. This is unrelated to dragging the button
-    // in the button bar, which takes a different path through the code.
-    [self setPulseState:gradient_button_cell::kPulsedOff];
-  }
-
-  return [super startTrackingAt:startPoint inView:controlView];
-}
-
 // Since we have our own drawWithFrame:, we need to also have our own
 // logic for determining when the mouse is inside for honoring this
 // request.
 - (void)setShowsBorderOnlyWhileMouseInside:(BOOL)showOnly {
   [super setShowsBorderOnlyWhileMouseInside:showOnly];
   if (showOnly) {
     [self updateTrackingAreas];
   } else {
     if (trackingArea_) {
       [[self controlView] removeTrackingArea:trackingArea_];
       trackingArea_.reset(nil);
       if (isMouseInside_) {
         isMouseInside_ = NO;
         [[self controlView] setNeedsDisplay:YES];
       }
     }
   }
 }
 
 // TODO(viettrungluu): clean up/reorganize.
 - (void)drawBorderAndFillForTheme:(const ui::ThemeProvider*)themeProvider
                       controlView:(NSView*)controlView
                         innerPath:(NSBezierPath*)innerPath
               showClickedGradient:(BOOL)showClickedGradient
             showHighlightGradient:(BOOL)showHighlightGradient
                        hoverAlpha:(CGFloat)hoverAlpha
                            active:(BOOL)active
                         cellFrame:(NSRect)cellFrame
                   defaultGradient:(NSGradient*)defaultGradient {
-  // For Material Design, draw a solid rounded rect behind the button, based on
-  // the hover and pressed states.
-  if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback) {
-    const CGFloat kEightPercentAlpha = 0.08;
-    const CGFloat kFourPercentAlpha = 0.04;
-
-    // The alpha is always at least 8%. Default the color to black.
-    CGFloat alpha = kEightPercentAlpha;
-    CGFloat color = 0.0;
-    // If a dark theme, incrase the opacity slightly and use white.
-    if ([[controlView window] hasDarkTheme]) {
-      alpha += kFourPercentAlpha;
-      color = 1.0;
-    }
-    // If clicked or highlighted, the background is slightly more opaque. If not
-    // clicked or highlighted, adjust the alpha by the animation fade in
-    // percentage.
-    if (showClickedGradient || showHighlightGradient) {
-      alpha += kFourPercentAlpha;
-    } else {
-      alpha *= hoverAlpha;
-    }
-
-    // Fill the path.
-    [[NSColor colorWithCalibratedWhite:color alpha:alpha] set];
-    [innerPath fill];
-    return;
-  }
-
   BOOL isFlatButton = [self showsBorderOnlyWhileMouseInside];
 
   // For flat (unbordered when not hovered) buttons, never use the toolbar
   // button background image, but the modest gradient used for themed buttons.
   // To make things even more modest, scale the hover alpha down by 40 percent
   // unless clicked.
   NSColor* backgroundImageColor;
   BOOL useThemeGradient;
   if (isFlatButton) {
     backgroundImageColor = nil;
@@ skipping 93 matching lines @@
   [innerPath stroke];
 }
 
 // TODO(viettrungluu): clean this up.
 // (Private)
 - (void)getDrawParamsForFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
                      clipPath:(NSBezierPath**)returnClipPath {
-  const CGFloat kLineWidth = [controlView cr_lineWidth];
-  const CGFloat kHalfLineWidth = kLineWidth / 2.0;
+  const CGFloat lineWidth = [controlView cr_lineWidth];
+  const CGFloat halfLineWidth = lineWidth / 2.0;
 
-  NSRect drawFrame = cellFrame;
-  NSRect innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
-  CGFloat cornerRadius = 2;
-  if ([self tag] != kMaterialStandardButtonTypeWithLimitedClickFeedback) {
-    drawFrame = NSInsetRect(cellFrame, 1.5 * kLineWidth, 1.5 * kLineWidth);
-    cornerRadius = 3;
-  }
+  // Constants from Cole.  Will kConstant them once the feedback loop
+  // is complete.
+  NSRect drawFrame = NSInsetRect(cellFrame, 1.5 * lineWidth, 1.5 * lineWidth);
+  NSRect innerFrame = NSInsetRect(cellFrame, lineWidth, lineWidth);
+  const CGFloat radius = 3;
 
   ButtonType type = [[(NSControl*)controlView cell] tag];
   switch (type) {
     case kMiddleButtonType:
       drawFrame.size.width += 20;
       innerFrame.size.width += 2;
       // Fallthrough
     case kRightButtonType:
       drawFrame.origin.x -= 20;
       innerFrame.origin.x -= 2;
       // Fallthrough
     case kLeftButtonType:
     case kLeftButtonWithShadowType:
       drawFrame.size.width += 20;
       innerFrame.size.width += 2;
     default:
       break;
   }
   if (type == kLeftButtonWithShadowType)
     innerFrame.size.width -= 1.0;
 
   // Return results if |return...| not null.
   if (returnInnerFrame)
     *returnInnerFrame = innerFrame;
   if (returnInnerPath) {
     DCHECK(*returnInnerPath == nil);
     *returnInnerPath = [NSBezierPath bezierPathWithRoundedRect:drawFrame
-                                                       xRadius:cornerRadius
-                                                       yRadius:cornerRadius];
-    [*returnInnerPath setLineWidth:kLineWidth];
+                                                       xRadius:radius
+                                                       yRadius:radius];
+    [*returnInnerPath setLineWidth:lineWidth];
   }
   if (returnClipPath) {
     DCHECK(*returnClipPath == nil);
     NSRect clipPathRect =
-        NSInsetRect(drawFrame, -kHalfLineWidth, -kHalfLineWidth);
+        NSInsetRect(drawFrame, -halfLineWidth, -halfLineWidth);
     *returnClipPath = [NSBezierPath
         bezierPathWithRoundedRect:clipPathRect
-                          xRadius:cornerRadius + kHalfLineWidth
-                          yRadius:cornerRadius + kHalfLineWidth];
+                          xRadius:radius + halfLineWidth
+                          yRadius:radius + halfLineWidth];
   }
 }
 
 // TODO(viettrungluu): clean this up.
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   NSRect innerFrame;
   NSBezierPath* innerPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:&innerFrame
@@ skipping 37 matching lines @@
                  ThemeProperties::COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE) :
         [NSColor blackColor];
 
     [[stroke colorWithAlphaComponent:0.2] set];
     NSRectFillUsingOperation(NSInsetRect(borderRect, 0, 2),
                              NSCompositeSourceOver);
   }
   [self drawInteriorWithFrame:innerFrame inView:controlView];
 }
 
-- (CGFloat)textStartXOffset {
-  // 11 is the magic number needed to make this match the native
-  // NSButtonCell's label display.
-  return [[self image] size].width + 11;
-}
-
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   const CGFloat lineWidth = [controlView cr_lineWidth];
 
   if (shouldTheme_) {
     BOOL isTemplate = [[self image] isTemplate];
 
     gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
     CGContextRef context =
         (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
@@ skipping 60 matching lines @@
 // get it to work with NSButtonCell.
 // TODO(jeremy): Move this to GTM.
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)cellFrame
              inView:(NSView*)controlView {
   NSSize size = [title size];
 
   // Empirically, Cocoa will draw an extra 2 pixels past NSWidth(cellFrame)
   // before it clips the text.
   const CGFloat kOverflowBeforeClip = 2;
-  BOOL isModeMaterial =
-      [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback;
-  // For Material Design we don't want to clip the text. For all other button
-  // cell modes, we do.
-  BOOL shouldClipTheTitle = !isModeMaterial;
+  BOOL clipping = YES;
   if (std::floor(size.width) <= (NSWidth(cellFrame) + kOverflowBeforeClip)) {
     cellFrame.origin.y += ([self verticalTextOffset] - 1);
-    shouldClipTheTitle = NO;
+    clipping = NO;
   }
 
   // Gradient is about twice our line height long.
   CGFloat gradientWidth = MIN(size.height * 2, NSWidth(cellFrame) / 4);
 
   NSRect solidPart, gradientPart;
   NSDivideRect(cellFrame, &gradientPart, &solidPart, gradientWidth, NSMaxXEdge);
 
   // Draw non-gradient part without transparency layer, as light text on a dark
   // background looks bad with a gradient layer.
   NSPoint textOffset = NSZeroPoint;
   {
     gfx::ScopedNSGraphicsContextSaveGState scopedGState;
-    if (shouldClipTheTitle)
+    if (clipping)
       [NSBezierPath clipRect:solidPart];
 
-    CGFloat textLeft = [self textStartXOffset];
+    // 11 is the magic number needed to make this match the native
+    // NSButtonCell's label display.
+    CGFloat textLeft = [[self image] size].width + 11;
 
     // For some reason, the height of cellFrame as passed in is totally bogus.
     // For vertical centering purposes, we need the bounds of the containing
     // view.
     NSRect buttonFrame = [[self controlView] frame];
 
     // Call the vertical offset to match native NSButtonCell's version.
     textOffset = NSMakePoint(textLeft,
                              (NSHeight(buttonFrame) - size.height) / 2 +
                              [self verticalTextOffset]);
-    // WIth Material Design we want an ellipsis if the title is too long to fit,
-    // so have to use drawInRect: instead of drawAtPoint:.
-    if (isModeMaterial) {
-      NSRect textBounds = NSMakeRect(textOffset.x,
-                                     textOffset.y,
-                                     NSWidth(buttonFrame) - textOffset.x,
-                                     NSHeight(buttonFrame));
-      [title drawInRect:textBounds];
-    } else {
-      [title drawAtPoint:textOffset];
-    }
+    [title drawAtPoint:textOffset];
   }
 
-  if (!shouldClipTheTitle)
+  if (!clipping)
     return cellFrame;
 
   // Draw the gradient part with a transparency layer. This makes the text look
   // suboptimal, but since it fades out, that's ok.
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [NSBezierPath clipRect:gradientPart];
   CGContextRef context = static_cast<CGContextRef>(
       [[NSGraphicsContext currentContext] graphicsPort]);
   CGContextBeginTransparencyLayerWithRect(context,
                                           NSRectToCGRect(gradientPart), 0);
@@ skipping 64 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end