ui/native_theme/native_theme_aura.cc - Issue 309483009: Remaining bits to get views_examples_with_content_exe to work on Mac

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/native_theme/native_theme_aura.cc

Issue 309483009: Remaining bits to get views_examples_with_content_exe to work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: neater still Created 6 years, 6 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:

Index: ui/native_theme/native_theme_aura.cc

diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc

index ec192d2352b0c246e57c430b1210cdd97fbd0c1c..3f71613f9bd89379712081d6d5b5373a930ef829 100644

--- a/ui/native_theme/native_theme_aura.cc

+++ b/ui/native_theme/native_theme_aura.cc

@@ -67,12 +67,14 @@ const int kScrollbarTrackImages[9] = IMAGE_GRID(IDR_SCROLLBAR_BASE);

} // namespace

-#if !defined(OS_WIN)

+#if !defined(OS_WIN) && !defined(OS_MACOSX)

// static

NativeTheme* NativeTheme::instance() {

return NativeThemeAura::instance();

}

+#endif

+#if !defined(OS_WIN)

// static

NativeThemeAura* NativeThemeAura::instance() {

CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ());