ui/base/theme_provider.h - Issue 8497054: Upstream: ui implementation in Android

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/theme_provider.h

Issue 8497054: Upstream: ui implementation in Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments and sync Created 9 years, 1 month 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/base/theme_provider.h

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

index 64da6ca7e4d6916db4528e7202731b2548a9e882..1d76bdf9e6ef8e9af9326281226da515f12bb73f 100644

--- a/ui/base/theme_provider.h

+++ b/ui/base/theme_provider.h

@@ -100,7 +100,7 @@ class UI_EXPORT ThemeProvider {

// Gets the NSGradient with the specified |id|.

virtual NSGradient* GetNSGradient(int id) const = 0;

-#elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS)

+#elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)

// Gets the GdkPixbuf with the specified |id|. Returns a pointer to a shared

// instance of the GdkPixbuf. This shared GdkPixbuf is owned by the theme

// provider and should not be freed.

« no previous file with comments | « ui/base/resource/resource_bundle_android.cc ('k') | ui/gfx/canvas_skia_android.cc » ('j') | no next file with comments »