Chromium Code Reviews| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| index 546acd47f92fd9d1fdeb97a5689438e0ac188593..ab7aeccb053087c2071975c4639cf12696a2f370 100644 |
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| @@ -45,8 +45,14 @@ enum DimensionType { WIDTH, HEIGHT }; |
| // Returns the width or height of the toolbar action icon size. |
| int GetIconDimension(DimensionType type) { |
| +#if defined(OS_MACOSX) |
| + // On the Mac, the spec is a 24x24 button in a 28x28 space. |
| + if (ui::MaterialDesignController::IsModeMaterial()) |
| + return 24; |
|
sky
2016/04/11 15:13:02
The conditional is the same, so move the ifdef ins
|
| +#else |
| if (ui::MaterialDesignController::IsModeMaterial()) |
| return 28; |
| +#endif |
| static bool initialized = false; |
| static int icon_height = 0; |