chrome/browser/ui/cocoa/styled_text_field_cell.mm - Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a

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/cocoa/styled_text_field_cell.mm

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes? Created 5 years 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

« chrome/browser/ui/cocoa/gradient_button_cell.mm ('K') | « chrome/browser/ui/cocoa/gradient_button_cell.mm ('k') | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/styled_text_field_cell.mm

diff --git a/chrome/browser/ui/cocoa/styled_text_field_cell.mm b/chrome/browser/ui/cocoa/styled_text_field_cell.mm

index e0732700360ea3ea2f7450096f5a8bc100dba6f2..a7353c0dc395077e904ded8162dfdedcb37fe906 100644

--- a/chrome/browser/ui/cocoa/styled_text_field_cell.mm

+++ b/chrome/browser/ui/cocoa/styled_text_field_cell.mm

@@ -90,8 +90,7 @@

// Paint button background image if there is one (otherwise the border won't

// look right).

- ThemeService* themeProvider =

- static_cast<ThemeService*>([[controlView window] themeProvider]);

+ ui::ThemeProvider* themeProvider = [[controlView window] themeProvider];

if (themeProvider) {

NSColor* backgroundImageColor = nil;

if (themeProvider->HasCustomImage(IDR_THEME_BUTTON_BACKGROUND)) {

@@ -148,8 +147,7 @@

// Draw optional bezel below bottom stroke.

if ([self shouldDrawBezel] && themeProvider &&

- themeProvider->UsingDefaultTheme()) {

+ themeProvider->UsingSystemTheme()) {

NSColor* bezelColor = themeProvider->GetNSColor(

ThemeProperties::COLOR_TOOLBAR_BEZEL);

[[bezelColor colorWithAlphaComponent:0.5 / lineWidth] set];