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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 1406613002: For some vector icons, get the size from the vector definition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months 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
Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index b886ab4b3f08650d71546da9a9baa49113cc7271..5341c45188445ca5085799ec7e4f2b3e6ef62487 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -734,7 +734,6 @@ void ToolbarView::LoadImages() {
const ui::ThemeProvider* tp = GetThemeProvider();
if (ui::MaterialDesignController::IsModeMaterial()) {
- const int kButtonSize = 16;
const SkColor normal_color =
tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
const SkColor disabled_color =
@@ -742,21 +741,21 @@ void ToolbarView::LoadImages() {
back_->SetImage(views::Button::STATE_NORMAL,
gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
- kButtonSize, normal_color));
+ normal_color));
back_->SetImage(views::Button::STATE_DISABLED,
gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
- kButtonSize, disabled_color));
+ disabled_color));
forward_->SetImage(
views::Button::STATE_NORMAL,
- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
+ gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
normal_color));
forward_->SetImage(
views::Button::STATE_DISABLED,
- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
+ gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
disabled_color));
home_->SetImage(views::Button::STATE_NORMAL,
gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,
- kButtonSize, normal_color));
+ normal_color));
app_menu_button_->UpdateIcon();
back_->set_ink_drop_base_color(normal_color);

Powered by Google App Engine
This is Rietveld 408576698