chrome/browser/ui/views/toolbar/reload_button.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/reload_button.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

Index: chrome/browser/ui/views/toolbar/reload_button.cc

diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc

index 3d1f2f65227ac8cb2a2d8f7fbdf680cd3524727c..45e57cb25ffd22229b613ec6d2dae58f01f93de5 100644

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

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

@@ -233,15 +233,14 @@ void ReloadButton::ChangeModeInternal(Mode mode) {

const gfx::VectorIconId icon_id = (mode == MODE_RELOAD)

? gfx::VectorIconId::NAVIGATE_RELOAD

: gfx::VectorIconId::NAVIGATE_STOP;

- 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);

SetImage(views::Button::STATE_NORMAL,

- gfx::CreateVectorIcon(icon_id, kButtonSize, normal_color));

+ gfx::CreatePrimaryVectorIcon(icon_id, normal_color));

SetImage(views::Button::STATE_DISABLED,

- gfx::CreateVectorIcon(icon_id, kButtonSize, disabled_color));

+ gfx::CreatePrimaryVectorIcon(icon_id, disabled_color));

} else {

SetImage(views::Button::STATE_NORMAL,

*(tp->GetImageSkiaNamed((mode == MODE_RELOAD) ? IDR_RELOAD

« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | ui/gfx/paint_vector_icon.cc » ('J')