chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/tabs/tab_strip_controller.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/tab_contents/tab_contents_controller.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

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

index c02c58faca1a437475125eff09943edccbf4f185..7c84ab83571dc63c900fdbbcd86aa6f896aef1af 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -2358,8 +2358,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {

}

- (void)setNewTabImages {

- ThemeService *theme =

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

+ ui::ThemeProvider* theme = [[tabStripView_ window] themeProvider];

if (!theme)

return;

@@ -2380,7 +2379,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {

forButtonState:image_button_cell::kPressedState];

// IDR_THEME_TAB_BACKGROUND_INACTIVE is only used with the default theme.

- if (theme->UsingDefaultTheme()) {

+ if (theme->UsingSystemTheme()) {

const CGFloat alpha = tabs::kImageNoFocusAlpha;

NSImage* background = ApplyMask(

theme->GetNSImageNamed(IDR_THEME_TAB_BACKGROUND_INACTIVE), mask);