ui/ui.gyp - Issue 110283005: Make aura_demo 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/ui.gyp

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix resolve Created 6 years, 11 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

diff --git a/ui/ui.gyp b/ui/ui.gyp

index bb8ea32240d3f87c4670c49cde8e0170e05cf8d7..fd1b70120acfb3a6cc5d54e834959c6ad1091c79 100644

--- a/ui/ui.gyp

+++ b/ui/ui.gyp

@@ -133,6 +133,7 @@

'base/cursor/cursor_loader_x11.cc',

'base/cursor/cursor_loader_x11.h',

'base/cursor/cursor_null.cc',

+ 'base/cursor/cursor_mac.mm',

'base/cursor/cursor_win.cc',

'base/cursor/cursor_x11.cc',

'base/cursor/cursors_aura.cc',

@@ -356,6 +357,8 @@

}],

['use_aura==1', {

'sources/': [

+ ['exclude', 'base/clipboard/clipboard_mac.mm'],

+ ['exclude', 'base/layout_mac.mm'],

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

['exclude', 'base/x/active_window_watcher_x.cc'],

['exclude', 'base/x/active_window_watcher_x.h'],

@@ -374,6 +377,7 @@

'base/cursor/cursor.h',

'base/cursor/cursor_loader_x11.cc',

'base/cursor/cursor_loader_x11.h',

+ 'base/cursor/cursor_mac.mm',

'base/cursor/cursor_win.cc',

'base/cursor/cursor_x11.cc',

'base/x/selection_owner.cc',

« no previous file with comments | « ui/resources/ui_resources.grd ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »