cocoa browser: remove non-material toolbar support

chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.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/toolbar/toolbar_button_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
@@ skipping 135 matching lines @@
 - (void)viewDidMoveToWindow;
 
 @end
 
 
 @implementation ToolbarButton
 
 @synthesize handleMiddleClick = handleMiddleClick_;
 
 + (NSSize)toolbarButtonSize {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return NSMakeSize(29, 29);
-  }
-
   return kMDButtonBounds.size;
 }
 
 - (void)otherMouseDown:(NSEvent*)theEvent {
   if (![self shouldHandleEvent:theEvent]) {
     [super otherMouseDown:theEvent];
     return;
   }
 
   NSEvent* nextEvent = theEvent;
@@ skipping 58 matching lines @@
   return themeIsDark ? SK_ColorWHITE : SkColorSetRGB(0x5A, 0x5A, 0x5A);
 }
 
 - (NSImage*)browserToolsIconForFillColor:(SkColor)fillColor {
   // Create a |BrowserToolsImageRep| to draw the browser tools icon using
   // the provided fill color.
   base::scoped_nsobject<BrowserToolsImageRep> imageRep(
       [[BrowserToolsImageRep alloc]
           initWithDrawSelector:@selector(drawBrowserToolsIcon:)
                       delegate:[BrowserToolsImageRep class]]);
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    [imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
-  } else {
-    [imageRep setFillColor:skia::SkColorToSRGBNSColor(fillColor)];
-  }
+  [imageRep setFillColor:skia::SkColorToSRGBNSColor(fillColor)];
 
   // Create the image from the image rep.
   NSImage* browserToolsIcon =
       [[[NSImage alloc] initWithSize:kMDButtonIconSize] autorelease];
   [browserToolsIcon setCacheMode:NSImageCacheAlways];
   [browserToolsIcon addRepresentation:imageRep];
 
   return browserToolsIcon;
 }
 
@@ skipping 11 matching lines @@
   // Create the image from the image rep.
   NSImage* image =
       [[[NSImage alloc] initWithSize:kMDButtonBounds.size] autorelease];
   [image setCacheMode:NSImageCacheAlways];
   [image addRepresentation:imageRep];
 
   return image;
 }
 
 - (NSImage*)image {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return [super image];
-  }
   // setImage: stores the image in an ivar.
   return image_.get();
 }
 
 - (void)setImage:(NSImage*)anImage {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    [super setImage:anImage];
-    return;
-  }
-
   // We want to set the default image as the image for kDefaultState. Setting it
   // as the default image (via setImage:) can cause ghosting from the two
   // default images being drawn over each other. However we also need to keep
   // the default image around for resetButtonStateImages, so stick it in an
   // ivar.
   image_.reset([anImage retain]);
   [self resetButtonStateImages];
 }
 
 - (void)resetButtonStateImages {
-  DCHECK(ui::MaterialDesignController::IsModeMaterial());
-
   NSImage* normalIcon = nil;
   NSImage* disabledIcon = nil;
   BOOL isDarkTheme = NO;
 
   gfx::VectorIconId iconId = [self vectorIconId];
   if (iconId == gfx::VectorIconId::VECTOR_ICON_NONE) {
     // If the button does not have a vector icon id (e.g. it's an extension
     // button), use its image. The hover, etc. images will be created using
     // imageForIcon:withBackgroundStyle: so do the same for the default image.
     // If we don't do this, the icon may not appear in the same place as in the
@@ skipping 67 matching lines @@
   [theCell setImage:disabledIcon
      forButtonState:image_button_cell::kDisabledState];
 
   [self setNeedsDisplay:YES];
 }
 
 - (void)viewDidMoveToWindow {
   // In Material Design we want to catch when the button is attached to its
   // window so that we can configure its appearance based on the window's
   // theme.
-  if ([self window] && ui::MaterialDesignController::IsModeMaterial()) {
+  if ([self window]) {
     [self resetButtonStateImages];
   }
 }
 
 // ThemedWindowDrawing implementation.
 
 - (void)windowDidChangeTheme {
   // Update the hover and pressed image backgrounds to match the current theme.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    [self resetButtonStateImages];
-  }
+  [self resetButtonStateImages];
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end