Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4851)

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.cc

Issue 1472863004: [MD] re-skin extension browser action badges (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/extensions/icon_with_badge_image_source.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/12/01 21:06:42 Is this guaranteed to be the same across all platf
Evan Stade 2015/12/01 23:15:58 if you mean OSX vs. Windows, yes. I think it might
tdanderson 2015/12/02 00:57:10 Actually there is no difference between material a
+
static bool initialized = false;
static int icon_height = 0;
static int icon_width = 0;
« no previous file with comments | « chrome/browser/ui/extensions/icon_with_badge_image_source.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698