ui/base/default_theme_provider.h - Issue 391053002: MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files

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: ui/base/default_theme_provider.h

Issue 391053002: MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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: ui/base/default_theme_provider.h

diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h

index e2589c732e7634082f4c8b9078be3094ad8feb0b..8bf2a01cc0341008d0e080623d1456cafbe0cd50 100644

--- a/ui/base/default_theme_provider.h

+++ b/ui/base/default_theme_provider.h

@@ -34,7 +34,7 @@ class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider {

int id,

ui::ScaleFactor scale_factor) const OVERRIDE;

-#if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)

+#if defined(OS_MACOSX)

virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;

virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;

virtual NSColor* GetNSColor(int id) const OVERRIDE;

« no previous file with comments | « no previous file | ui/base/default_theme_provider_mac.mm » ('j') | no next file with comments »