webkit/glue/webkit_glue.gypi - 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/webkit_glue.gypi

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/webkit_glue.gypi

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi

index 4fb60f6ae367dadb6cbc24dd1706ca4e525a6538..636fd03080373ed35fbcb337c4771aca6d47f3bb 100644

--- a/webkit/glue/webkit_glue.gypi

+++ b/webkit/glue/webkit_glue.gypi

@@ -352,8 +352,8 @@

'websocketstreamhandle_impl.h',

'webthemeengine_impl_android.cc',

'webthemeengine_impl_android.h',

- 'webthemeengine_impl_linux.cc',

- 'webthemeengine_impl_linux.h',

+ 'webthemeengine_impl_default.cc',

+ 'webthemeengine_impl_default.h',

'webthemeengine_impl_mac.cc',

'webthemeengine_impl_mac.h',

'webthemeengine_impl_win.cc',

@@ -384,6 +384,17 @@

# own hard dependencies.

'hard_dependency': 1,

'conditions': [

+ ['use_default_render_theme==0', {

+ 'sources/': [

+ ['exclude', 'webthemeengine_impl_default.cc'],

+ ['exclude', 'webthemeengine_impl_default.h'],

+ ],

+ }, { # else: use_default_render_theme==1

+ 'sources/': [

+ ['exclude', 'webthemeengine_impl_win.cc'],

+ ['exclude', 'webthemeengine_impl_win.h'],

+ ],

+ }],

['toolkit_uses_gtk == 1', {

'dependencies': [

'<(DEPTH)/build/linux/system.gyp:gtk',

« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »