ui/ui.gyp - Issue 10241005: Make win_aura work without ash.

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/ui.gyp

Issue 10241005: Make win_aura work without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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/ui.gyp

===================================================================

--- ui/ui.gyp (revision 134107)

+++ ui/ui.gyp (working copy)

@@ -435,8 +435,6 @@

['exclude', 'gfx/screen_gtk.cc'],

['exclude', 'gfx/screen_win.cc'],

['exclude', 'base/dragdrop/drag_utils_win.cc'],

- ['exclude', 'base/view_prop.cc'],

- ['exclude', 'base/view_prop.h'],

['exclude', 'base/win/mouse_wheel_util.cc'],

['exclude', 'base/win/mouse_wheel_util.h'],

['exclude', 'base/work_area_watcher_observer.h'],

@@ -593,6 +591,14 @@

},{ # OS!="win"

+ 'conditions': [

+ ['use_aura==0', {

+ 'sources!': [

+ 'base/view_prop.cc',

+ 'base/view_prop.h',

+ ],

+ }],

+ ],

'sources!': [

'base/dragdrop/drag_source.cc',

'base/dragdrop/drag_source.h',

@@ -600,8 +606,6 @@

'base/dragdrop/drop_target.cc',

'base/dragdrop/drop_target.h',

'base/dragdrop/os_exchange_data.cc',

- 'base/view_prop.cc',

- 'base/view_prop.h',

'gfx/native_theme_win.cc',

'gfx/native_theme_win.h',