| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") | 
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") | 
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") | 
| 8 import("//ui/base/ui_features.gni") | 8 import("//ui/base/ui_features.gni") | 
| 9 | 9 | 
| 10 # Historical note: Ash shipped on Windows for a couple years to support | 10 # Historical note: Ash shipped on Windows for a couple years to support | 
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 658     "wm/immersive_gesture_handler_aura.h", | 658     "wm/immersive_gesture_handler_aura.h", | 
| 659     "wm/immersive_handler_factory_ash.cc", | 659     "wm/immersive_handler_factory_ash.cc", | 
| 660     "wm/immersive_handler_factory_ash.h", | 660     "wm/immersive_handler_factory_ash.h", | 
| 661     "wm/lock_layout_manager.cc", | 661     "wm/lock_layout_manager.cc", | 
| 662     "wm/lock_layout_manager.h", | 662     "wm/lock_layout_manager.h", | 
| 663     "wm/lock_state_controller.cc", | 663     "wm/lock_state_controller.cc", | 
| 664     "wm/lock_state_controller.h", | 664     "wm/lock_state_controller.h", | 
| 665     "wm/lock_state_observer.h", | 665     "wm/lock_state_observer.h", | 
| 666     "wm/lock_window_state.cc", | 666     "wm/lock_window_state.cc", | 
| 667     "wm/lock_window_state.h", | 667     "wm/lock_window_state.h", | 
| 668     "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.cc", |  | 
| 669     "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.h", |  | 
| 670     "wm/maximize_mode/maximize_mode_controller.cc", |  | 
| 671     "wm/maximize_mode/maximize_mode_controller.h", |  | 
| 672     "wm/maximize_mode/maximize_mode_event_handler.cc", |  | 
| 673     "wm/maximize_mode/maximize_mode_event_handler.h", |  | 
| 674     "wm/maximize_mode/maximize_mode_event_handler_aura.cc", |  | 
| 675     "wm/maximize_mode/maximize_mode_event_handler_aura.h", |  | 
| 676     "wm/maximize_mode/maximize_mode_window_manager.cc", |  | 
| 677     "wm/maximize_mode/maximize_mode_window_manager.h", |  | 
| 678     "wm/maximize_mode/maximize_mode_window_state.cc", |  | 
| 679     "wm/maximize_mode/maximize_mode_window_state.h", |  | 
| 680     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h", |  | 
| 681     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", |  | 
| 682     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", |  | 
| 683     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", |  | 
| 684     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", |  | 
| 685     "wm/mru_window_tracker.cc", | 668     "wm/mru_window_tracker.cc", | 
| 686     "wm/mru_window_tracker.h", | 669     "wm/mru_window_tracker.h", | 
| 687     "wm/overlay_event_filter.cc", | 670     "wm/overlay_event_filter.cc", | 
| 688     "wm/overlay_event_filter.h", | 671     "wm/overlay_event_filter.h", | 
| 689     "wm/overview/cleanup_animation_observer.cc", | 672     "wm/overview/cleanup_animation_observer.cc", | 
| 690     "wm/overview/cleanup_animation_observer.h", | 673     "wm/overview/cleanup_animation_observer.h", | 
| 691     "wm/overview/overview_animation_type.h", | 674     "wm/overview/overview_animation_type.h", | 
| 692     "wm/overview/scoped_overview_animation_settings.cc", | 675     "wm/overview/scoped_overview_animation_settings.cc", | 
| 693     "wm/overview/scoped_overview_animation_settings.h", | 676     "wm/overview/scoped_overview_animation_settings.h", | 
| 694     "wm/overview/scoped_transform_overview_window.cc", | 677     "wm/overview/scoped_transform_overview_window.cc", | 
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 738     "wm/switchable_windows.h", | 721     "wm/switchable_windows.h", | 
| 739     "wm/system_gesture_event_filter.cc", | 722     "wm/system_gesture_event_filter.cc", | 
| 740     "wm/system_gesture_event_filter.h", | 723     "wm/system_gesture_event_filter.h", | 
| 741     "wm/system_modal_container_event_filter.cc", | 724     "wm/system_modal_container_event_filter.cc", | 
| 742     "wm/system_modal_container_event_filter.h", | 725     "wm/system_modal_container_event_filter.h", | 
| 743     "wm/system_modal_container_event_filter_delegate.h", | 726     "wm/system_modal_container_event_filter_delegate.h", | 
| 744     "wm/system_modal_container_layout_manager.cc", | 727     "wm/system_modal_container_layout_manager.cc", | 
| 745     "wm/system_modal_container_layout_manager.h", | 728     "wm/system_modal_container_layout_manager.h", | 
| 746     "wm/system_wallpaper_controller.cc", | 729     "wm/system_wallpaper_controller.cc", | 
| 747     "wm/system_wallpaper_controller.h", | 730     "wm/system_wallpaper_controller.h", | 
|  | 731     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h", | 
|  | 732     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", | 
|  | 733     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", | 
|  | 734     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 
|  | 735     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 
|  | 736     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc", | 
|  | 737     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h", | 
|  | 738     "wm/tablet_mode/tablet_mode_controller.cc", | 
|  | 739     "wm/tablet_mode/tablet_mode_controller.h", | 
|  | 740     "wm/tablet_mode/tablet_mode_event_handler.cc", | 
|  | 741     "wm/tablet_mode/tablet_mode_event_handler.h", | 
|  | 742     "wm/tablet_mode/tablet_mode_event_handler_aura.cc", | 
|  | 743     "wm/tablet_mode/tablet_mode_event_handler_aura.h", | 
|  | 744     "wm/tablet_mode/tablet_mode_window_manager.cc", | 
|  | 745     "wm/tablet_mode/tablet_mode_window_manager.h", | 
|  | 746     "wm/tablet_mode/tablet_mode_window_state.cc", | 
|  | 747     "wm/tablet_mode/tablet_mode_window_state.h", | 
| 748     "wm/toplevel_window_event_handler.cc", | 748     "wm/toplevel_window_event_handler.cc", | 
| 749     "wm/toplevel_window_event_handler.h", | 749     "wm/toplevel_window_event_handler.h", | 
| 750     "wm/video_detector.cc", | 750     "wm/video_detector.cc", | 
| 751     "wm/video_detector.h", | 751     "wm/video_detector.h", | 
| 752     "wm/widget_finder.cc", | 752     "wm/widget_finder.cc", | 
| 753     "wm/widget_finder.h", | 753     "wm/widget_finder.h", | 
| 754     "wm/window_animation_types.h", | 754     "wm/window_animation_types.h", | 
| 755     "wm/window_animations.cc", | 755     "wm/window_animations.cc", | 
| 756     "wm/window_animations.h", | 756     "wm/window_animations.h", | 
| 757     "wm/window_cycle_controller.cc", | 757     "wm/window_cycle_controller.cc", | 
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 912     ] | 912     ] | 
| 913     deps += [ | 913     deps += [ | 
| 914       "//ui/events/devices/x11", | 914       "//ui/events/devices/x11", | 
| 915       "//ui/events/platform", | 915       "//ui/events/platform", | 
| 916       "//ui/gfx/x", | 916       "//ui/gfx/x", | 
| 917     ] | 917     ] | 
| 918   } else { | 918   } else { | 
| 919     sources -= [ | 919     sources -= [ | 
| 920       "host/ash_window_tree_host_x11.cc", | 920       "host/ash_window_tree_host_x11.cc", | 
| 921       "host/ash_window_tree_host_x11.h", | 921       "host/ash_window_tree_host_x11.h", | 
| 922       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 922       "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 
| 923       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 923       "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 
| 924     ] | 924     ] | 
| 925   } | 925   } | 
| 926 | 926 | 
| 927   if (use_ozone) { | 927   if (use_ozone) { | 
| 928     deps += [ | 928     deps += [ | 
| 929       "//ui/events:dom_keycode_converter", | 929       "//ui/events:dom_keycode_converter", | 
| 930       "//ui/events/ozone:events_ozone", | 930       "//ui/events/ozone:events_ozone", | 
| 931       "//ui/ozone", | 931       "//ui/ozone", | 
| 932     ] | 932     ] | 
| 933   } else { | 933   } else { | 
| 934     sources -= [ | 934     sources -= [ | 
| 935       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", | 935       "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", | 
| 936       "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", | 936       "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", | 
| 937     ] | 937     ] | 
| 938   } | 938   } | 
| 939 | 939 | 
| 940   # Usage of content should be in ash_content_unittests. | 940   # Usage of content should be in ash_content_unittests. | 
| 941   assert_no_deps = [ | 941   assert_no_deps = [ | 
| 942     "//content/public/browser", | 942     "//content/public/browser", | 
| 943     "//content/public/common", | 943     "//content/public/common", | 
| 944   ] | 944   ] | 
| 945 } | 945 } | 
| 946 | 946 | 
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1241     "system/web_notification/web_notification_tray_unittest.cc", | 1241     "system/web_notification/web_notification_tray_unittest.cc", | 
| 1242     "test/ash_test_helper_unittest.cc", | 1242     "test/ash_test_helper_unittest.cc", | 
| 1243     "tooltips/tooltip_controller_unittest.cc", | 1243     "tooltips/tooltip_controller_unittest.cc", | 
| 1244     "tray_action/tray_action_unittest.cc", | 1244     "tray_action/tray_action_unittest.cc", | 
| 1245     "wallpaper/wallpaper_controller_unittest.cc", | 1245     "wallpaper/wallpaper_controller_unittest.cc", | 
| 1246     "window_user_data_unittest.cc", | 1246     "window_user_data_unittest.cc", | 
| 1247     "wm/ash_focus_rules_unittest.cc", | 1247     "wm/ash_focus_rules_unittest.cc", | 
| 1248     "wm/container_finder_unittest.cc", | 1248     "wm/container_finder_unittest.cc", | 
| 1249     "wm/immersive_fullscreen_controller_unittest.cc", | 1249     "wm/immersive_fullscreen_controller_unittest.cc", | 
| 1250     "wm/lock_state_controller_unittest.cc", | 1250     "wm/lock_state_controller_unittest.cc", | 
| 1251     "wm/maximize_mode/accelerometer_test_data_literals.cc", |  | 
| 1252     "wm/maximize_mode/maximize_mode_window_manager_unittest.cc", |  | 
| 1253     "wm/mru_window_tracker_unittest.cc", | 1251     "wm/mru_window_tracker_unittest.cc", | 
| 1254     "wm/overlay_event_filter_unittest.cc", | 1252     "wm/overlay_event_filter_unittest.cc", | 
| 1255     "wm/overview/cleanup_animation_observer_unittest.cc", | 1253     "wm/overview/cleanup_animation_observer_unittest.cc", | 
| 1256     "wm/overview/window_selector_unittest.cc", | 1254     "wm/overview/window_selector_unittest.cc", | 
| 1257     "wm/panels/panel_layout_manager_unittest.cc", | 1255     "wm/panels/panel_layout_manager_unittest.cc", | 
| 1258     "wm/panels/panel_window_resizer_unittest.cc", | 1256     "wm/panels/panel_window_resizer_unittest.cc", | 
| 1259     "wm/root_window_layout_manager_unittest.cc", | 1257     "wm/root_window_layout_manager_unittest.cc", | 
| 1260     "wm/screen_dimmer_unittest.cc", | 1258     "wm/screen_dimmer_unittest.cc", | 
| 1261     "wm/screen_pinning_controller_unittest.cc", | 1259     "wm/screen_pinning_controller_unittest.cc", | 
| 1262     "wm/session_state_animator_impl_unittest.cc", | 1260     "wm/session_state_animator_impl_unittest.cc", | 
| 1263     "wm/stacking_controller_unittest.cc", | 1261     "wm/stacking_controller_unittest.cc", | 
| 1264     "wm/system_modal_container_layout_manager_unittest.cc", | 1262     "wm/system_modal_container_layout_manager_unittest.cc", | 
|  | 1263     "wm/tablet_mode/accelerometer_test_data_literals.cc", | 
|  | 1264     "wm/tablet_mode/tablet_mode_window_manager_unittest.cc", | 
| 1265     "wm/toplevel_window_event_handler_unittest.cc", | 1265     "wm/toplevel_window_event_handler_unittest.cc", | 
| 1266     "wm/video_detector_unittest.cc", | 1266     "wm/video_detector_unittest.cc", | 
| 1267     "wm/window_animations_unittest.cc", | 1267     "wm/window_animations_unittest.cc", | 
| 1268     "wm/window_cycle_controller_unittest.cc", | 1268     "wm/window_cycle_controller_unittest.cc", | 
| 1269     "wm/window_manager_unittest.cc", | 1269     "wm/window_manager_unittest.cc", | 
| 1270     "wm/window_modality_controller_unittest.cc", | 1270     "wm/window_modality_controller_unittest.cc", | 
| 1271     "wm/window_positioner_unittest.cc", | 1271     "wm/window_positioner_unittest.cc", | 
| 1272     "wm/window_state_unittest.cc", | 1272     "wm/window_state_unittest.cc", | 
| 1273     "wm/window_util_unittest.cc", | 1273     "wm/window_util_unittest.cc", | 
| 1274     "wm/workspace/magnetism_matcher_unittest.cc", | 1274     "wm/workspace/magnetism_matcher_unittest.cc", | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1394 | 1394 | 
| 1395     # TODO: mash doesn't support OverviewGestureHandler. | 1395     # TODO: mash doesn't support OverviewGestureHandler. | 
| 1396     # http://crbug.com/634994. | 1396     # http://crbug.com/634994. | 
| 1397     "wm/gestures/overview_gesture_handler_unittest.cc", | 1397     "wm/gestures/overview_gesture_handler_unittest.cc", | 
| 1398 | 1398 | 
| 1399     # TODO: fails because keyboard is not enabled in mash. | 1399     # TODO: fails because keyboard is not enabled in mash. | 
| 1400     # http://crbug.com/648733. | 1400     # http://crbug.com/648733. | 
| 1401     "wm/lock_layout_manager_unittest.cc", | 1401     "wm/lock_layout_manager_unittest.cc", | 
| 1402 | 1402 | 
| 1403     # TODO: investigate failures in mash. http://crbug.com/698092. | 1403     # TODO: investigate failures in mash. http://crbug.com/698092. | 
| 1404     "wm/maximize_mode/maximize_mode_controller_unittest.cc", | 1404     "wm/tablet_mode/tablet_mode_controller_unittest.cc", | 
| 1405 | 1405 | 
| 1406     # TODO: mash doesn't support CursorManager. http://crbug.com/631103. | 1406     # TODO: mash doesn't support CursorManager. http://crbug.com/631103. | 
| 1407     "wm/resize_shadow_and_cursor_unittest.cc", | 1407     "wm/resize_shadow_and_cursor_unittest.cc", | 
| 1408 | 1408 | 
| 1409     # TODO: mash doesn't support SetFirstDisplayAsInternalDisplay(), which all | 1409     # TODO: mash doesn't support SetFirstDisplayAsInternalDisplay(), which all | 
| 1410     # the tests in this file use. http://crbug.com/698091. | 1410     # the tests in this file use. http://crbug.com/698091. | 
| 1411     "wm/system_gesture_event_filter_unittest.cc", | 1411     "wm/system_gesture_event_filter_unittest.cc", | 
| 1412 | 1412 | 
| 1413     # TODO: MultiWindowResizeControllerTests fail in mash. | 1413     # TODO: MultiWindowResizeControllerTests fail in mash. | 
| 1414     # http://crbug.com/699172. | 1414     # http://crbug.com/699172. | 
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1514     "//content/public/app:both", | 1514     "//content/public/app:both", | 
| 1515     "//device/bluetooth", | 1515     "//device/bluetooth", | 
| 1516   ] | 1516   ] | 
| 1517 | 1517 | 
| 1518   data_deps = [ | 1518   data_deps = [ | 
| 1519     "//ash/strings:ash_test_strings", | 1519     "//ash/strings:ash_test_strings", | 
| 1520     "//ash/resources:ash_test_resources_with_content_100_percent", | 1520     "//ash/resources:ash_test_resources_with_content_100_percent", | 
| 1521     "//ash/resources:ash_test_resources_200_percent", | 1521     "//ash/resources:ash_test_resources_200_percent", | 
| 1522   ] | 1522   ] | 
| 1523 } | 1523 } | 
| OLD | NEW | 
|---|