MacViews: Fix GN build

ui/views/views.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
     # Sources lists shared with GN build.
     'views_sources': [
       'accessibility/native_view_accessibility.cc',
       'accessibility/native_view_accessibility.h',
@@ skipping 60 matching lines @@
       'controls/focusable_border.h',
       'controls/glow_hover_controller.cc',
       'controls/glow_hover_controller.h',
       'controls/image_view.cc',
       'controls/image_view.h',
       'controls/label.cc',
       'controls/label.h',
       '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',
       'controls/menu/menu_controller.h',
       'controls/menu/menu_controller_delegate.h',
       'controls/menu/menu_delegate.cc',
       'controls/menu/menu_delegate.h',
       'controls/menu/menu_event_dispatcher_linux.cc',
       'controls/menu/menu_event_dispatcher_linux.h',
       'controls/menu/menu_host.cc',
       'controls/menu/menu_host.h',
       'controls/menu/menu_host_root_view.cc',
       'controls/menu/menu_host_root_view.h',
       'controls/menu/menu_image_util.cc',
       'controls/menu/menu_image_util.h',
       'controls/menu/menu_insertion_delegate_win.h',
       'controls/menu/menu_item_view.cc',
       'controls/menu/menu_item_view.h',
       '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',
       'controls/menu/menu_message_pump_dispatcher_win.h',
       'controls/menu/menu_model_adapter.cc',
       'controls/menu/menu_model_adapter.h',
       'controls/menu/menu_runner.cc',
       'controls/menu/menu_runner.h',
       'controls/menu/menu_runner_handler.h',
       'controls/menu/menu_runner_impl.cc',
@@ skipping 10 matching lines @@
       'controls/menu/menu_separator_win.cc',
       'controls/menu/menu_types.h',
       'controls/menu/native_menu_win.cc',
       'controls/menu/native_menu_win.h',
       'controls/menu/submenu_view.cc',
       'controls/menu/submenu_view.h',
       'controls/message_box_view.cc',
       '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',
       'controls/prefix_selector.cc',
       'controls/prefix_selector.h',
       'controls/progress_bar.cc',
       'controls/progress_bar.h',
       'controls/resize_area.cc',
       'controls/resize_area.h',
       'controls/resize_area_delegate.h',
@@ skipping 51 matching lines @@
       'controls/tree/tree_view.h',
       'controls/tree/tree_view_controller.cc',
       'controls/tree/tree_view_controller.h',
       'cull_set.cc',
       'cull_set.h',
       'debug_utils.cc',
       'debug_utils.h',
       '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',
       'focus/external_focus_tracker.h',
       'focus/focus_manager.cc',
       'focus/focus_manager.h',
       'focus/focus_manager_delegate.h',
       'focus/focus_manager_factory.cc',
       'focus/focus_manager_factory.h',
       'focus/focus_search.cc',
@@ skipping 24 matching lines @@
       'linux_ui/linux_ui.cc',
       'linux_ui/linux_ui.h',
       'linux_ui/status_icon_linux.cc',
       'linux_ui/status_icon_linux.h',
       'linux_ui/window_button_order_observer.h',
       'linux_ui/window_button_order_provider.cc',
       'masked_targeter_delegate.cc',
       'masked_targeter_delegate.h',
       'metrics.cc',
       'metrics.h',
-      'metrics_aura.cc',
       'metrics_mac.cc',
       'mouse_constants.h',
       'mouse_watcher.cc',
       'mouse_watcher.h',
       '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',
       'painter.h',
       'rect_based_targeting_utils.cc',
       'rect_based_targeting_utils.h',
       'repeat_controller.cc',
       'repeat_controller.h',
       'round_rect_painter.cc',
       'round_rect_painter.h',
       'shadow_border.cc',
       'shadow_border.h',
       'view.cc',
       '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',
       'view_model_utils.h',
       'view_targeter.cc',
       'view_targeter.h',
       'view_targeter_delegate.cc',
       'view_targeter_delegate.h',
       'views_delegate.cc',
       'views_delegate.h',
       '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',
       'widget/native_widget_private.h',
       'widget/root_view.cc',
       'widget/root_view.h',
       'widget/root_view_targeter.cc',
       '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',
       'widget/widget_aura_utils.h',
       'widget/widget_delegate.cc',
       'widget/widget_delegate.h',
       'widget/widget_deletion_observer.cc',
       'widget/widget_deletion_observer.h',
       'widget/widget_observer.h',
       'widget/widget_removals_observer.h',
@@ skipping 40 matching lines @@
       '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/bubble_window_targeter.cc',
       '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',
       'corewm/tooltip_aura.cc',
       'corewm/tooltip_aura.h',
       'corewm/tooltip_controller.cc',
       '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',
     ],
     'views_desktop_aura_sources': [
       'widget/desktop_aura/desktop_capture_client.cc',
       'widget/desktop_aura/desktop_capture_client.h',
       'widget/desktop_aura/desktop_cursor_loader_updater.h',
       'widget/desktop_aura/desktop_dispatcher_client.cc',
       'widget/desktop_aura/desktop_dispatcher_client.h',
       'widget/desktop_aura/desktop_drop_target_win.cc',
@@ skipping 53 matching lines @@
       'widget/desktop_aura/desktop_factory_ozone.h',
       'widget/desktop_aura/desktop_screen_ozone.cc',
       'widget/desktop_aura/desktop_window_tree_host_ozone.cc',
     ],
     'views_test_support_sources': [
       'controls/textfield/textfield_test_api.cc',
       'controls/textfield/textfield_test_api.h',
       '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',
       'test/focus_manager_test.cc',
       'test/focus_manager_test.h',
       'test/menu_runner_test_api.cc',
       'test/menu_runner_test_api.h',
       'test/slider_test_api.cc',
       'test/slider_test_api.h',
       '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',
     ],
     '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',
       'accessibility/native_view_accessibility_win_unittest.cc',
       'accessible_pane_view_unittest.cc',
       'animation/bounds_animator_unittest.cc',
       'bubble/bubble_border_unittest.cc',
       'bubble/bubble_delegate_unittest.cc',
       'bubble/bubble_frame_view_unittest.cc',
       'bubble/bubble_window_targeter_unittest.cc',
       'cocoa/bridged_native_widget_unittest.mm',
       'cocoa/cocoa_mouse_capture_unittest.mm',
       'controls/button/blue_button_unittest.cc',
       'controls/button/custom_button_unittest.cc',
       'controls/button/image_button_unittest.cc',
       'controls/button/label_button_unittest.cc',
       'controls/button/menu_button_unittest.cc',
       'controls/combobox/combobox_unittest.cc',
       'controls/label_unittest.cc',
       'controls/menu/menu_controller_unittest.cc',
       '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',
       'controls/native/native_view_host_unittest.cc',
       'controls/prefix_selector_unittest.cc',
       'controls/progress_bar_unittest.cc',
       'controls/scroll_view_unittest.cc',
       'controls/scrollbar/scrollbar_unittest.cc',
       'controls/single_split_view_unittest.cc',
       'controls/slider_unittest.cc',
@@ skipping 10 matching lines @@
       'focus/focus_manager_unittest.cc',
       'focus/focus_traversal_unittest.cc',
       'layout/box_layout_unittest.cc',
       'layout/grid_layout_unittest.cc',
       'rect_based_targeting_utils_unittest.cc',
       'run_all_unittests.cc',
       'view_model_unittest.cc',
       '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',
       'widget/widget_unittest.cc',
       'widget/window_reorderer_unittest.cc',
       'window/custom_frame_view_unittest.cc',
       'window/dialog_client_view_unittest.cc',
       'window/dialog_delegate_unittest.cc',
     ],
     'views_unittests_desktop_sources': [
       'ime/input_method_bridge_unittest.cc',
       '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',
       'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
     ],
     'views_unittests_desktop_aurax11_sources': [
       'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc',
       'widget/desktop_aura/desktop_screen_x11_unittest.cc',
       'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc',
     ],
@@ skipping 160 matching lines @@
         '../gfx/gfx.gyp:gfx_geometry',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '<@(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': [
             '../aura/aura.gyp:aura',
             '../aura/aura.gyp:aura_test_support',
             '../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
     {
       # GN version: //ui/views:views_unittests
       'target_name': 'views_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
@@ skipping 135 matching lines @@
                 '../aura/aura.gyp:aura',
                 '../wm/wm.gyp:wm',
               ],
             }],
           ],
         },  # target_name: macviews_interactive_ui_tests
       ],  # targets
     }],
   ],  # conditions
 }