chrome/browser/ui/views/toolbar/toolbar_view.cc - Issue 1406613002: For some vector icons, get the size from the vector definition.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Created 5 years, 2 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

« no previous file with comments | « chrome/browser/ui/views/toolbar/reload_button.cc ('k') | chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc » ('j') | ui/gfx/paint_vector_icon.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1d1c007d07dac9a101e2e3d763cbfe1e6754d618..618ff42dbcb8d86fb0359d30d4bdbfb21f17d0d2 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -771,29 +771,27 @@ void ToolbarView::LoadImages() {

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 =

tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);

back_->SetImage(views::Button::STATE_NORMAL,

- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,

- kButtonSize, normal_color));

+ gfx::CreatePrimaryVectorIcon(

+ gfx::VectorIconId::NAVIGATE_BACK, normal_color));

back_->SetImage(views::Button::STATE_DISABLED,

- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,

- kButtonSize, disabled_color));

- forward_->SetImage(

- views::Button::STATE_NORMAL,

- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,

- normal_color));

+ gfx::CreatePrimaryVectorIcon(

+ gfx::VectorIconId::NAVIGATE_BACK, disabled_color));

+ forward_->SetImage(views::Button::STATE_NORMAL,

+ gfx::CreatePrimaryVectorIcon(

+ gfx::VectorIconId::NAVIGATE_FORWARD, normal_color));

forward_->SetImage(

views::Button::STATE_DISABLED,

- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,

- disabled_color));

+ gfx::CreatePrimaryVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,

+ disabled_color));

home_->SetImage(views::Button::STATE_NORMAL,

- gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,

- kButtonSize, normal_color));

+ gfx::CreatePrimaryVectorIcon(

+ gfx::VectorIconId::NAVIGATE_HOME, normal_color));

app_menu_button_->UpdateIcon();

} else {

back_->SetImage(views::Button::STATE_NORMAL,