| Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| index 62bc2d7af23a00849a8c08e690809ea8d564ad72..118e94a4b76e89b32bae316754f5978796066043 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| @@ -31,6 +31,7 @@
|
| #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";
|
| @@ -181,6 +182,18 @@ const CGFloat kBrowserActionBubbleYOffset = 3.0;
|
|
|
| @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.
|
| @@ -958,18 +971,24 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
|
| 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];
|
|
|