webkit/glue/webkitplatformsupport_impl.h - Issue 11299074: Make use_aura set use_default_render_theme and moves

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: webkit/glue/webkitplatformsupport_impl.h

Issue 11299074: Make use_aura set use_default_render_theme and moves (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Merge 2 trunk and update some ifdefs Created 8 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: webkit/glue/webkitplatformsupport_impl.h

diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h

index 263cdc7e4e1aa43dc2fd630902126a37679a32dc..1d719f512790acd0e8f3a4ef12377e496361210b 100644

--- a/webkit/glue/webkitplatformsupport_impl.h

+++ b/webkit/glue/webkitplatformsupport_impl.h

@@ -14,17 +14,16 @@

#include "webkit/glue/resource_loader_bridge.h"

#include "webkit/glue/webkit_glue_export.h"

-#if defined(OS_WIN)

+#if defined(USE_DEFAULT_RENDER_THEME)

+#include "webkit/glue/webthemeengine_impl_default.h"

+#elif defined(OS_WIN)

#include "webkit/glue/webthemeengine_impl_win.h"

#elif defined(OS_MACOSX)

#include "webkit/glue/webthemeengine_impl_mac.h"

#elif defined(OS_ANDROID)

#include "webkit/glue/webthemeengine_impl_android.h"

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

-#include "webkit/glue/webthemeengine_impl_linux.h"

#endif

class MessageLoop;

namespace webkit {

« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webthemeengine_impl_default.h » ('j') | no next file with comments »