Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: views/views.gyp

Issue 7739016: aura-views: Make views_aura_desktop compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/drag_utils_linux.cc ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index c5f0eda0f0d90f8a96e2a451c094c4a9917f9ff4..1428a9be69285a9bf79b8f93c73a9f48e7d2b859 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -236,6 +236,7 @@
'drag_utils.cc',
'drag_utils.h',
'drag_utils_gtk.cc',
+ 'drag_utils_linux.cc',
'drag_utils_win.cc',
'events/event.cc',
'events/event.h',
@@ -417,6 +418,10 @@
'dependencies': [
'../aura/aura.gyp:aura',
],
+ 'sources/': [
+ ['exclude', '_(gtk|x)\\.cc$'],
+ ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
+ ],
'sources!': [
'controls/menu/menu_2.cc',
'controls/menu/menu_2.h',
@@ -436,6 +441,8 @@
'controls/table/table_view_observer.h',
'controls/tree/tree_view.cc',
'controls/tree/tree_view.h',
+ 'focus/accelerator_handler_aura.cc',
+ 'focus/accelerator_handler_touch.cc',
'widget/aero_tooltip_manager.cc',
'widget/aero_tooltip_manager.h',
'widget/child_window_message_processor.cc',
@@ -451,6 +458,10 @@
],
}],
],
+ }, { # else: use_aura==1
+ 'sources!': [
+ 'drag_utils_linux.cc',
+ ]
}],
['toolkit_uses_gtk == 1', {
'dependencies': [
@@ -842,6 +853,7 @@
'target_name': 'views_aura_desktop',
'type': 'executable',
'dependencies': [
+ '../aura/aura.gyp:aura',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../skia/skia.gyp:skia',
« no previous file with comments | « views/drag_utils_linux.cc ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698