chrome/browser/ui/views/tabs/tab.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/tabs/tab.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

« no previous file with comments | « chrome/browser/ui/views/location_bar/selected_keyword_view.cc ('k') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('j') | ui/views/controls/menu/menu_image_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab.cc

diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc

index 74e1e3289534a123d204ebf73b37f863a9589239..3e53a1ea4ad224c336731ebeb8ec98c1488fd0c6 100644

--- a/chrome/browser/ui/views/tabs/tab.cc

+++ b/chrome/browser/ui/views/tabs/tab.cc

@@ -118,7 +118,6 @@ const double kImmersiveTabMinThrobOpacity = 0.66;

const int kImmersiveLoadingStepCount = 32;

const char kTabCloseButtonName[] = "TabCloseButton";

-const int kTabCloseButtonSize = 16;

// Returns the width of the tab endcap at scale 1. More precisely, this is the

// width of the curve making up either the outer or inner edge of the stroke;

@@ -538,10 +537,10 @@ Tab::Tab(TabController* controller, gfx::AnimationContainer* container)

// on the current theme and active state. The hovered and pressed images

// don't depend on the these, so we can set them here.

const gfx::ImageSkia& hovered = gfx::CreateVectorIcon(

- gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED, kTabCloseButtonSize,

+ gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED,

SkColorSetRGB(0xDB, 0x44, 0x37));

const gfx::ImageSkia& pressed = gfx::CreateVectorIcon(

- gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED, kTabCloseButtonSize,

+ gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED,

SkColorSetRGB(0xA8, 0x35, 0x2A));

close_button_->SetImage(views::CustomButton::STATE_HOVERED, &hovered);

close_button_->SetImage(views::CustomButton::STATE_PRESSED, &pressed);

@@ -1638,8 +1637,7 @@ void Tab::OnButtonColorMaybeChanged() {

title_->SetEnabledColor(title_color);

alert_indicator_button_->OnParentTabButtonColorChanged();

const gfx::ImageSkia& close_button_normal_image = gfx::CreateVectorIcon(

- gfx::VectorIconId::TAB_CLOSE_NORMAL, kTabCloseButtonSize,

- button_color_);

+ gfx::VectorIconId::TAB_CLOSE_NORMAL, button_color_);

close_button_->SetImage(views::CustomButton::STATE_NORMAL,

&close_button_normal_image);

}