Update extension buttons to Material Design (Mac).

chrome/browser/ui/cocoa/extensions/browser_actions_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/extensions/browser_actions_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 13 matching lines @@
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #include "ui/base/cocoa/appkit_utils.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 NSString* const kBrowserActionVisibilityChangedNotification =
     @"BrowserActionVisibilityChangedNotification";
 
 namespace {
 
 const CGFloat kAnimationDuration = 0.2;
 
 const CGFloat kChevronWidth = 18;
 
@@ skipping 130 matching lines @@
 // Called when the window for the active bubble is closing, and sets the active
 // bubble to nil.
 - (void)bubbleWindowClosing:(NSNotification*)notification;
 
 // Sets the current focused view. Should only be used for the overflow
 // container.
 - (void)setFocusedViewIndex:(NSInteger)index;
 
 @end
 
+// A subclass of MenuButton that draws the chevron button in MD style.
+@interface ChevronMenuButton : MenuButton
+@end
+
+@implementation ChevronMenuButton
+
+- (gfx::VectorIconId)vectorIconId {
+  return gfx::VectorIconId::OVERFLOW_CHEVRON;
+}
+
+@end
+
 namespace {
 
 // A bridge between the ToolbarActionsBar and the BrowserActionsController.
 class ToolbarActionsBarBridge : public ToolbarActionsBarDelegate {
  public:
   explicit ToolbarActionsBarBridge(BrowserActionsController* controller);
   ~ToolbarActionsBarBridge() override;
 
   BrowserActionsController* controller_for_test() { return controller_; }
 
@@ skipping 757 matching lines @@
   [chevronMenuButton_ setFrame:buttonFrame];
 }
 
 - (void)setChevronHidden:(BOOL)hidden
                  inFrame:(NSRect)frame {
   if (!toolbarActionsBar_->platform_settings().chevron_enabled ||
       hidden == [self chevronIsHidden])
     return;
 
   if (!chevronMenuButton_.get()) {
-    chevronMenuButton_.reset([[MenuButton alloc] init]);
+    bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+    if (isModeMaterial) {
+      chevronMenuButton_.reset([[ChevronMenuButton alloc] init]);
+    } else {
+      chevronMenuButton_.reset([[MenuButton alloc] init]);
+    }
     [chevronMenuButton_ setOpenMenuOnClick:YES];
     [chevronMenuButton_ setBordered:NO];
     [chevronMenuButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
-    [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW
-                           forButtonState:image_button_cell::kDefaultState];
-    [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW_H
-                           forButtonState:image_button_cell::kHoverState];
-    [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW_P
-                           forButtonState:image_button_cell::kPressedState];
-
+    if (!isModeMaterial) {
+      [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW
+                             forButtonState:image_button_cell::kDefaultState];
+      [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW_H
+                             forButtonState:image_button_cell::kHoverState];
+      [[chevronMenuButton_ cell] setImageID:IDR_BROWSER_ACTIONS_OVERFLOW_P
+                             forButtonState:image_button_cell::kPressedState];
+    }
     overflowMenu_.reset([[NSMenu alloc] initWithTitle:@""]);
     [overflowMenu_ setAutoenablesItems:NO];
     [overflowMenu_ setDelegate:self];
     [chevronMenuButton_ setAttachedMenu:overflowMenu_];
 
     [containerView_ addSubview:chevronMenuButton_];
   }
 
   [self updateChevronPositionInFrame:frame];
 
@@ skipping 69 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end