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

Unified Diff: ui/views/views.gyp

Issue 249113002: MacViews: Adds NativeWidgetMac and gets views target compiling on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments, provide a stub for GestureRecognizer Created 6 years, 7 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
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 510f261ac60dcc2ddb3de87303092cfe47dc1a35..65ecf70a880e4e6b6f02855abb46d1dfbb5b363a 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -12,6 +12,12 @@
'../aura/aura.gyp:aura',
'../wm/wm.gyp:wm',
],
+ }, { # use_aura==0
+ 'sources/': [
+ ['exclude', '^corewm/'],
+ ['exclude', '^touchui/'],
+ ['exclude', '^widget/desktop_aura/']
+ ]
}],
],
},
@@ -182,6 +188,7 @@
'controls/native/native_view_host.h',
'controls/native/native_view_host_aura.cc',
'controls/native/native_view_host_aura.h',
+ 'controls/native/native_view_host_mac.cc',
'controls/prefix_delegate.h',
'controls/prefix_selector.cc',
'controls/prefix_selector.h',
@@ -403,6 +410,8 @@
'widget/native_widget_aura.cc',
'widget/native_widget_aura.h',
'widget/native_widget_delegate.h',
+ 'widget/native_widget_mac.h',
+ 'widget/native_widget_mac.mm',
'widget/native_widget_private.h',
'widget/tooltip_manager_aura.cc',
'widget/tooltip_manager_aura.h',
@@ -461,6 +470,15 @@
}],
['use_ash==0', {
'sources!': [
+ 'accessibility/ax_aura_obj_cache.cc',
Ben Goodger (Google) 2014/05/22 17:33:55 why here vs. use_aura==0? i'm actually surprised
tapted 2014/05/23 01:11:30 I think ash makes the most sense for this. It was
tapted 2014/05/26 01:45:04 After some discussion in http://crbug.com/376603 m
+ 'accessibility/ax_aura_obj_cache.h',
+ 'accessibility/ax_aura_obj_wrapper.h',
+ 'accessibility/ax_view_obj_wrapper.cc',
+ 'accessibility/ax_view_obj_wrapper.h',
+ 'accessibility/ax_widget_obj_wrapper.cc',
+ 'accessibility/ax_widget_obj_wrapper.h',
+ 'accessibility/ax_window_obj_wrapper.cc',
+ 'accessibility/ax_window_obj_wrapper.h',
'bubble/tray_bubble_view.cc',
'bubble/tray_bubble_view.h',
],
@@ -531,6 +549,18 @@
'../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
],
}],
+ ['use_aura==0', {
+ 'sources!': [
+ 'bubble/bubble_window_targeter.cc',
+ 'bubble/bubble_window_targeter.h',
+ 'bubble/tray_bubble_view.cc',
+ 'bubble/tray_bubble_view.h',
+ 'mouse_watcher_view_host.cc',
+ 'mouse_watcher_view_host.h',
+ 'widget/window_reorderer.cc',
+ 'widget/window_reorderer.h',
+ ],
+ }],
],
}, # target_name: views
{

Powered by Google App Engine
This is Rietveld 408576698