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 a7c651d24fc3f10a4480a9cb3a26a12cbb9fbf8b..8c54913c71822ce66d685aafdb02992094a6b528 100644 |
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc |
| @@ -32,6 +32,7 @@ |
| #include "extensions/common/extension.h" |
| #include "extensions/common/feature_switch.h" |
| #include "grit/theme_resources.h" |
| +#include "ui/base/resource/material_design/material_design_controller.h" |
| #include "ui/base/resource/resource_bundle.h" |
| #include "ui/gfx/image/image_skia.h" |
| @@ -50,6 +51,9 @@ enum DimensionType { WIDTH, HEIGHT }; |
| // Returns the width or height of the toolbar action icon size. |
| int GetIconDimension(DimensionType type) { |
| + if (ui::MaterialDesignController::IsModeMaterial()) |
| + return 28; |
|
Devlin
2015/11/24 17:26:15
I personally preferred using the real asset, since
Evan Stade
2015/11/24 18:24:14
no, there's no asset, which is a good thing, and a
|
| + |
| static bool initialized = false; |
| static int icon_height = 0; |
| static int icon_width = 0; |