chrome/browser/themes/theme_service.cc - Issue 1354823002: Render the tab close button as a vector-based icon.

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/themes/theme_service.cc

Issue 1354823002: Render the tab close button as a vector-based icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove pointless #includes Created 5 years, 3 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/themes/theme_properties.h ('k') | chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm » ('j') | chrome/browser/ui/views/tabs/media_indicator_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/themes/theme_service.cc

diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc

index 59e32eff292a789b7081f93be8961b454630b0cf..17522dc1433b82cae6d376889b6fc97da372180e 100644

--- a/chrome/browser/themes/theme_service.cc

+++ b/chrome/browser/themes/theme_service.cc

@@ -231,14 +231,6 @@ SkColor ThemeService::GetColor(int id) const {

return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.86);

case Properties::COLOR_NTP_TEXT_LIGHT:

return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.40);

- case Properties::COLOR_TAB_ICON: {

- SkColor base_color;

- bool found_color = ui::CommonThemeGetSystemColor(

- ui::NativeTheme::kColorId_ChromeIconGrey, &base_color);

- DCHECK(found_color);

- color_utils::HSL hsl = GetTint(Properties::TINT_BUTTONS);

- return color_utils::HSLShift(base_color, hsl);

- }

case Properties::COLOR_THROBBER_SPINNING:

case Properties::COLOR_THROBBER_WAITING: {

SkColor base_color;