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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/views.gyp

Issue 1011323003: MacViews: Fix GN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: too ambitious Created 5 years, 9 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 | « ui/views/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index f5cecab7266511a851a5bd9f1d4a1b9a32924b18..4916d9e19e637a155f9a293da0858a3edd10e57a 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -78,13 +78,11 @@
'controls/link.cc',
'controls/link.h',
'controls/link_listener.h',
- 'controls/menu/display_change_listener_aura.cc',
'controls/menu/display_change_listener_mac.cc',
'controls/menu/menu.cc',
'controls/menu/menu.h',
'controls/menu/menu_config.cc',
'controls/menu/menu_config.h',
- 'controls/menu/menu_config_aura.cc',
'controls/menu/menu_config_mac.cc',
'controls/menu/menu_config_win.cc',
'controls/menu/menu_controller.cc',
@@ -106,8 +104,6 @@
'controls/menu/menu_listener.cc',
'controls/menu/menu_listener.h',
'controls/menu/menu_message_loop.h',
- 'controls/menu/menu_message_loop_aura.cc',
- 'controls/menu/menu_message_loop_aura.h',
'controls/menu/menu_message_loop_mac.cc',
'controls/menu/menu_message_loop_mac.h',
'controls/menu/menu_message_pump_dispatcher_win.cc',
@@ -138,8 +134,6 @@
'controls/message_box_view.h',
'controls/native/native_view_host.cc',
'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.h',
'controls/native/native_view_host_mac.mm',
'controls/prefix_delegate.h',
@@ -211,11 +205,8 @@
'drag_controller.h',
'drag_utils.cc',
'drag_utils.h',
- 'drag_utils_aura.cc',
'drag_utils_mac.mm',
'event_monitor.h',
- 'event_monitor_aura.cc',
- 'event_monitor_aura.h',
'event_monitor_mac.h',
'event_monitor_mac.mm',
'focus/external_focus_tracker.cc',
@@ -260,7 +251,6 @@
'masked_targeter_delegate.h',
'metrics.cc',
'metrics.h',
- 'metrics_aura.cc',
'metrics_mac.cc',
'mouse_constants.h',
'mouse_watcher.cc',
@@ -268,7 +258,6 @@
'mouse_watcher_view_host.cc',
'mouse_watcher_view_host.h',
'native_cursor.h',
- 'native_cursor_aura.cc',
'native_cursor_mac.mm',
'native_theme_delegate.h',
'painter.cc',
@@ -285,8 +274,6 @@
'view.h',
'view_constants.cc',
'view_constants.h',
- 'view_constants_aura.cc',
- 'view_constants_aura.h',
'view_model.cc',
'view_model.h',
'view_model_utils.cc',
@@ -300,15 +287,12 @@
'views_switches.cc',
'views_switches.h',
'views_touch_selection_controller_factory.h',
- 'views_touch_selection_controller_factory_aura.cc',
'views_touch_selection_controller_factory_mac.cc',
'widget/drop_helper.cc',
'widget/drop_helper.h',
'widget/monitor_win.cc',
'widget/monitor_win.h',
'widget/native_widget.h',
- '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',
@@ -319,8 +303,6 @@
'widget/root_view_targeter.h',
'widget/tooltip_manager.cc',
'widget/tooltip_manager.h',
- 'widget/tooltip_manager_aura.cc',
- 'widget/tooltip_manager_aura.h',
'widget/widget.cc',
'widget/widget.h',
'widget/widget_aura_utils.cc',
@@ -381,6 +363,12 @@
'bubble/bubble_window_targeter.h',
'bubble/tray_bubble_view.cc',
'bubble/tray_bubble_view.h',
+ 'controls/menu/display_change_listener_aura.cc',
+ 'controls/menu/menu_config_aura.cc',
+ 'controls/menu/menu_message_loop_aura.cc',
+ 'controls/menu/menu_message_loop_aura.h',
+ 'controls/native/native_view_host_aura.cc',
+ 'controls/native/native_view_host_aura.h',
'corewm/cursor_height_provider_win.cc',
'corewm/cursor_height_provider_win.h',
'corewm/tooltip.h',
@@ -390,10 +378,22 @@
'corewm/tooltip_controller.h',
'corewm/tooltip_win.cc',
'corewm/tooltip_win.h',
+ 'drag_utils_aura.cc',
+ 'event_monitor_aura.cc',
+ 'event_monitor_aura.h',
+ 'metrics_aura.cc',
+ 'native_cursor_aura.cc',
'touchui/touch_editing_menu.cc',
'touchui/touch_editing_menu.h',
'touchui/touch_selection_controller_impl.cc',
'touchui/touch_selection_controller_impl.h',
+ 'view_constants_aura.cc',
+ 'view_constants_aura.h',
+ 'views_touch_selection_controller_factory_aura.cc',
+ 'widget/native_widget_aura.cc',
+ 'widget/native_widget_aura.h',
+ 'widget/tooltip_manager_aura.cc',
+ 'widget/tooltip_manager_aura.h',
'widget/window_reorderer.cc',
'widget/window_reorderer.h',
],
@@ -467,7 +467,6 @@
'test/capture_tracking_view.cc',
'test/capture_tracking_view.h',
'test/desktop_test_views_delegate.h',
- 'test/desktop_test_views_delegate_aura.cc',
'test/desktop_test_views_delegate_mac.mm',
'test/event_generator_delegate_mac.h',
'test/event_generator_delegate_mac.mm',
@@ -480,23 +479,17 @@
'test/test_views.cc',
'test/test_views.h',
'test/test_views_delegate.h',
- 'test/test_views_delegate_aura.cc',
'test/test_views_delegate_mac.mm',
'test/test_widget_observer.cc',
'test/test_widget_observer.h',
- 'test/ui_controls_factory_desktop_aurax11.cc',
- 'test/ui_controls_factory_desktop_aurax11.h',
'test/views_test_base.cc',
'test/views_test_base.h',
'test/views_test_helper.cc',
'test/views_test_helper.h',
- 'test/views_test_helper_aura.cc',
- 'test/views_test_helper_aura.h',
'test/views_test_helper_mac.h',
'test/views_test_helper_mac.mm',
'test/widget_test.cc',
'test/widget_test.h',
- 'test/widget_test_aura.cc',
'test/widget_test_mac.mm',
'test/x11_property_change_waiter.cc',
'test/x11_property_change_waiter.h',
@@ -504,6 +497,15 @@
'views_test_support_aura_sources': [
'corewm/tooltip_controller_test_helper.cc',
'corewm/tooltip_controller_test_helper.h',
+ 'test/desktop_test_views_delegate_aura.cc',
+ 'test/test_views_delegate_aura.cc',
+ 'test/views_test_helper_aura.cc',
+ 'test/views_test_helper_aura.h',
+ 'test/widget_test_aura.cc',
+ ],
+ 'views_test_support_desktop_aura_x11_sources': [
+ 'test/ui_controls_factory_desktop_aurax11.cc',
+ 'test/ui_controls_factory_desktop_aurax11.h',
],
'views_unittests_sources': [
'accessibility/native_view_accessibility_unittest.cc',
@@ -527,7 +529,6 @@
'controls/menu/menu_item_view_unittest.cc',
'controls/menu/menu_model_adapter_unittest.cc',
'controls/menu/menu_runner_cocoa_unittest.mm',
- 'controls/native/native_view_host_aura_unittest.cc',
'controls/native/native_view_host_mac_unittest.mm',
'controls/native/native_view_host_test_base.cc',
'controls/native/native_view_host_test_base.h',
@@ -558,8 +559,6 @@
'view_model_utils_unittest.cc',
'view_targeter_unittest.cc',
'view_unittest.cc',
- 'view_unittest_aura.cc',
- 'widget/native_widget_aura_unittest.cc',
'widget/native_widget_mac_unittest.mm',
'widget/native_widget_unittest.cc',
'widget/root_view_unittest.cc',
@@ -574,8 +573,11 @@
'widget/desktop_widget_unittest.cc',
],
'views_unittests_aura_sources': [
+ 'controls/native/native_view_host_aura_unittest.cc',
'corewm/tooltip_controller_unittest.cc',
'touchui/touch_selection_controller_impl_unittest.cc',
+ 'view_unittest_aura.cc',
+ 'widget/native_widget_aura_unittest.cc',
],
'views_unittests_desktop_aura_sources': [
'widget/desktop_aura/desktop_focus_rules_unittest.cc',
@@ -756,12 +758,6 @@
'<@(views_test_support_sources)',
],
'conditions': [
- ['chromeos==1', {
- 'sources!': [
- 'test/ui_controls_factory_desktop_aurax11.cc',
- 'test/ui_controls_factory_desktop_aurax11.h',
- ],
- }],
['use_aura==1', {
'sources': [ '<@(views_test_support_aura_sources)' ],
'dependencies': [
@@ -770,6 +766,9 @@
'../wm/wm.gyp:wm',
],
}],
+ ['use_aura==1 and use_x11==1 and chromeos==0', {
+ 'sources': [ '<@(views_test_support_desktop_aura_x11_sources)' ],
+ }],
],
}, # target_name: views_test_support
{
« no previous file with comments | « ui/views/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698