diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/ash | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ash')
-rw-r--r-- | chromium/ash/ash.gyp | 148 | ||||
-rw-r--r-- | chromium/ash/ash_resources.gyp | 16 | ||||
-rw-r--r-- | chromium/ash/wm/common/ash_wm_common.gyp | 127 | ||||
-rw-r--r-- | chromium/ash/wm/common/ash_wm_common_resources.gyp | 26 |
4 files changed, 221 insertions, 96 deletions
diff --git a/chromium/ash/ash.gyp b/chromium/ash/ash.gyp index 2f04a548a6e..cb7cd4a6213 100644 --- a/chromium/ash/ash.gyp +++ b/chromium/ash/ash.gyp @@ -28,11 +28,10 @@ 'accelerators/spoken_feedback_toggler.cc', 'accelerators/spoken_feedback_toggler.h', 'accessibility_delegate.h', - 'app_list/app_list_shower_delegate.cc', - 'app_list/app_list_shower_delegate.h', - 'app_list/app_list_shower_delegate_factory.cc', - 'app_list/app_list_shower_delegate_factory.h', - 'app_list/app_list_view_delegate_factory.h', + 'app_list/app_list_presenter_delegate.cc', + 'app_list/app_list_presenter_delegate.h', + 'app_list/app_list_presenter_delegate_factory.cc', + 'app_list/app_list_presenter_delegate_factory.h', 'ash_constants.cc', 'ash_constants.h', 'ash_export.h', @@ -50,6 +49,9 @@ 'cancel_mode.h', 'cast_config_delegate.cc', 'cast_config_delegate.h', + 'container_delegate.h', + 'container_delegate_aura.cc', + 'container_delegate_aura.h', 'debug.cc', 'debug.h', 'default_accessibility_delegate.cc', @@ -73,8 +75,8 @@ 'display/display_change_observer_chromeos.h', 'display/display_color_manager_chromeos.cc', 'display/display_color_manager_chromeos.h', - 'display/window_tree_host_manager.cc', - 'display/window_tree_host_manager.h', + 'display/display_configuration_controller.cc', + 'display/display_configuration_controller.h', 'display/display_error_observer_chromeos.cc', 'display/display_error_observer_chromeos.h', 'display/display_info.cc', @@ -83,15 +85,13 @@ 'display/display_layout_store.h', 'display/display_manager.cc', 'display/display_manager.h', - 'display/display_configuration_controller.cc', - 'display/display_configuration_controller.h', 'display/display_pref_util.h', 'display/display_util.cc', 'display/display_util.h', - 'display/extended_mouse_warp_controller.cc', - 'display/extended_mouse_warp_controller.h', 'display/event_transformation_handler.cc', 'display/event_transformation_handler.h', + 'display/extended_mouse_warp_controller.cc', + 'display/extended_mouse_warp_controller.h', 'display/json_converter.cc', 'display/json_converter.h', 'display/mirror_window_controller.cc', @@ -117,6 +117,8 @@ 'display/shared_display_edge_indicator.h', 'display/unified_mouse_warp_controller.cc', 'display/unified_mouse_warp_controller.h', + 'display/window_tree_host_manager.cc', + 'display/window_tree_host_manager.h', 'drag_drop/drag_drop_controller.cc', 'drag_drop/drag_drop_controller.h', 'drag_drop/drag_drop_tracker.cc', @@ -175,10 +177,16 @@ 'keyboard/keyboard_ui_observer.h', 'keyboard_uma_event_filter.cc', 'keyboard_uma_event_filter.h', + 'link_handler_model.cc', + 'link_handler_model.h', + 'link_handler_model_factory.cc', + 'link_handler_model_factory.h', 'magnifier/magnification_controller.cc', 'magnifier/magnification_controller.h', 'magnifier/partial_magnification_controller.cc', 'magnifier/partial_magnification_controller.h', + 'material_design/material_design_controller.cc', + 'material_design/material_design_controller.h', 'metrics/desktop_task_switch_metric_recorder.cc', 'metrics/desktop_task_switch_metric_recorder.h', 'metrics/task_switch_metrics_recorder.cc', @@ -191,6 +199,9 @@ 'multi_profile_uma.h', 'networking_config_delegate.cc', 'networking_config_delegate.h', + 'pointer_watcher_delegate.h', + 'pointer_watcher_delegate_aura.cc', + 'pointer_watcher_delegate_aura.h', 'popup_message.cc', 'popup_message.h', 'root_window_controller.cc', @@ -216,8 +227,6 @@ 'shelf/app_list_button.h', 'shelf/app_list_shelf_item_delegate.cc', 'shelf/app_list_shelf_item_delegate.h', - 'shelf/background_animator.cc', - 'shelf/background_animator.h', 'shelf/overflow_bubble.cc', 'shelf/overflow_bubble.h', 'shelf/overflow_bubble_view.cc', @@ -233,6 +242,8 @@ 'shelf/shelf_bezel_event_filter.h', 'shelf/shelf_button.cc', 'shelf/shelf_button.h', + 'shelf/shelf_button_pressed_metric_tracker.cc', + 'shelf/shelf_button_pressed_metric_tracker.h', 'shelf/shelf_constants.cc', 'shelf/shelf_constants.h', 'shelf/shelf_delegate.h', @@ -260,8 +271,6 @@ 'shelf/shelf_util.h', 'shelf/shelf_view.cc', 'shelf/shelf_view.h', - 'shelf/shelf_button_pressed_metric_tracker.cc', - 'shelf/shelf_button_pressed_metric_tracker.h', 'shelf/shelf_widget.cc', 'shelf/shelf_widget.h', 'shelf/shelf_window_watcher.cc', @@ -282,17 +291,12 @@ 'sticky_keys/sticky_keys_overlay.cc', 'sticky_keys/sticky_keys_overlay.h', 'sticky_keys/sticky_keys_state.h', - 'switchable_windows.cc', - 'switchable_windows.h', 'system/audio/audio_observer.h', 'system/audio/tray_audio.cc', 'system/audio/tray_audio.h', 'system/audio/tray_audio_delegate.h', 'system/audio/volume_view.cc', 'system/audio/volume_view.h', - 'system/bluetooth/bluetooth_observer.h', - 'system/bluetooth/tray_bluetooth.cc', - 'system/bluetooth/tray_bluetooth.h', 'system/brightness_control_delegate.h', 'system/cast/tray_cast.cc', 'system/cast/tray_cast.h', @@ -304,6 +308,9 @@ 'system/chromeos/audio/tray_audio_delegate_chromeos.h', 'system/chromeos/bluetooth/bluetooth_notification_controller.cc', 'system/chromeos/bluetooth/bluetooth_notification_controller.h', + 'system/chromeos/bluetooth/bluetooth_observer.h', + 'system/chromeos/bluetooth/tray_bluetooth.cc', + 'system/chromeos/bluetooth/tray_bluetooth.h', 'system/chromeos/brightness/brightness_controller_chromeos.cc', 'system/chromeos/brightness/brightness_controller_chromeos.h', 'system/chromeos/brightness/tray_brightness.cc', @@ -514,46 +521,39 @@ 'touch/touch_uma.h', 'touch/touchscreen_util.cc', 'touch/touchscreen_util.h', - 'utility/partial_screenshot_controller.cc', - 'utility/partial_screenshot_controller.h', + 'utility/screenshot_controller.cc', + 'utility/screenshot_controller.h', 'virtual_keyboard_controller.cc', 'virtual_keyboard_controller.h', 'volume_control_delegate.h', - 'wm/always_on_top_controller.cc', - 'wm/always_on_top_controller.h', - 'wm/app_list_controller.cc', - 'wm/app_list_controller.h', 'wm/ash_focus_rules.cc', 'wm/ash_focus_rules.h', 'wm/ash_native_cursor_manager.cc', 'wm/ash_native_cursor_manager.h', + 'wm/aura/aura_layout_manager_adapter.cc', + 'wm/aura/aura_layout_manager_adapter.h', + 'wm/aura/wm_globals_aura.cc', + 'wm/aura/wm_globals_aura.h', + 'wm/aura/wm_lookup_aura.cc', + 'wm/aura/wm_lookup_aura.h', + 'wm/aura/wm_root_window_controller_aura.cc', + 'wm/aura/wm_root_window_controller_aura.h', + 'wm/aura/wm_shelf_aura.cc', + 'wm/aura/wm_shelf_aura.h', + 'wm/aura/wm_window_aura.cc', + 'wm/aura/wm_window_aura.h', 'wm/boot_splash_screen_chromeos.cc', 'wm/boot_splash_screen_chromeos.h', - 'wm/coordinate_conversion.cc', - 'wm/coordinate_conversion.h', 'wm/cursor_manager_chromeos.cc', 'wm/cursor_manager_chromeos.h', - 'wm/default_state.cc', - 'wm/default_state.h', - 'wm/default_window_resizer.cc', - 'wm/default_window_resizer.h', 'wm/dim_window.cc', 'wm/dim_window.h', - 'wm/dock/docked_window_layout_manager.cc', - 'wm/dock/docked_window_layout_manager.h', - 'wm/dock/docked_window_layout_manager_observer.h', - 'wm/dock/docked_window_resizer.cc', - 'wm/dock/docked_window_resizer.h', - 'wm/drag_details.cc', - 'wm/drag_details.h', 'wm/drag_window_controller.cc', 'wm/drag_window_controller.h', 'wm/drag_window_resizer.cc', 'wm/drag_window_resizer.h', 'wm/event_client_impl.cc', 'wm/event_client_impl.h', - 'wm/gestures/long_press_affordance_handler.cc', - 'wm/gestures/long_press_affordance_handler.h', 'wm/gestures/overview_gesture_handler.cc', 'wm/gestures/overview_gesture_handler.h', 'wm/gestures/shelf_gesture_handler.cc', @@ -603,12 +603,8 @@ 'wm/panels/attached_panel_window_targeter.h', 'wm/panels/panel_frame_view.cc', 'wm/panels/panel_frame_view.h', - 'wm/panels/panel_layout_manager.cc', - 'wm/panels/panel_layout_manager.h', 'wm/panels/panel_window_event_handler.cc', 'wm/panels/panel_window_event_handler.h', - 'wm/panels/panel_window_resizer.cc', - 'wm/panels/panel_window_resizer.h', 'wm/power_button_controller.cc', 'wm/power_button_controller.h', 'wm/resize_handle_window_targeter.cc', @@ -648,41 +644,14 @@ 'wm/window_cycle_controller.h', 'wm/window_cycle_list.cc', 'wm/window_cycle_list.h', - 'wm/window_positioner.cc', - 'wm/window_positioner.h', 'wm/window_properties.cc', 'wm/window_properties.h', - 'wm/window_resizer.cc', - 'wm/window_resizer.h', - 'wm/window_state.cc', - 'wm/window_state.h', - 'wm/window_state_delegate.cc', - 'wm/window_state_delegate.h', - 'wm/window_state_observer.h', - 'wm/window_state_util.cc', - 'wm/window_state_util.h', + 'wm/window_state_aura.cc', + 'wm/window_state_aura.h', 'wm/window_util.cc', 'wm/window_util.h', - 'wm/wm_event.cc', - 'wm/wm_event.h', - 'wm/wm_types.cc', - 'wm/wm_types.h', - 'wm/workspace/magnetism_matcher.cc', - 'wm/workspace/magnetism_matcher.h', - 'wm/workspace/multi_window_resize_controller.cc', - 'wm/workspace/multi_window_resize_controller.h', - 'wm/workspace/phantom_window_controller.cc', - 'wm/workspace/phantom_window_controller.h', - 'wm/workspace/two_step_edge_cycler.cc', - 'wm/workspace/two_step_edge_cycler.h', 'wm/workspace/workspace_event_handler.cc', 'wm/workspace/workspace_event_handler.h', - 'wm/workspace/workspace_layout_manager.cc', - 'wm/workspace/workspace_layout_manager.h', - 'wm/workspace/workspace_layout_manager_delegate.h', - 'wm/workspace/workspace_types.h', - 'wm/workspace/workspace_window_resizer.cc', - 'wm/workspace/workspace_window_resizer.h', 'wm/workspace_controller.cc', 'wm/workspace_controller.h', ], @@ -704,8 +673,6 @@ 'desktop_background/desktop_background_controller_test_api.h', 'shell/toplevel_window.cc', 'shell/toplevel_window.h', - 'test/app_list_controller_test_api.cc', - 'test/app_list_controller_test_api.h', 'test/ash_test_base.cc', 'test/ash_test_base.h', 'test/ash_test_helper.cc', @@ -718,6 +685,8 @@ 'test/cursor_manager_test_api.h', 'test/display_manager_test_api.cc', 'test/display_manager_test_api.h', + 'test/material_design_controller_test_api.cc', + 'test/material_design_controller_test_api.h', 'test/mirror_window_test_api.cc', 'test/mirror_window_test_api.h', 'test/overflow_bubble_view_test_api.cc', @@ -819,9 +788,7 @@ 'accelerators/accelerator_table_unittest.cc', 'accelerators/magnifier_key_scroller_unittest.cc', 'accelerators/spoken_feedback_toggler_unittest.cc', - # TODO(mfomitchev): uncomment when ash::Shell is switched to using - # app_list::AppListShower instead of ash::AppListController. -# 'app_list/app_list_shower_delegate_unittest.cc', + 'app_list/app_list_presenter_delegate_unittest.cc', 'ash_touch_exploration_manager_chromeos_unittest.cc', 'autoclick/autoclick_unittest.cc', 'content/display/screen_orientation_controller_chromeos_unittest.cc', @@ -857,6 +824,7 @@ 'frame/default_header_painter_unittest.cc', 'host/ash_window_tree_host_x11_unittest.cc', 'magnifier/magnification_controller_unittest.cc', + 'material_design/material_design_controller_unittest.cc', 'metrics/desktop_task_switch_metric_recorder_unittest.cc', 'metrics/task_switch_metrics_recorder_unittest.cc', 'metrics/task_switch_time_tracker_unittest.cc', @@ -907,12 +875,11 @@ 'touch/touch_observer_hud_unittest.cc', 'touch/touch_transformer_controller_unittest.cc', 'touch/touchscreen_util_unittest.cc', - 'utility/partial_screenshot_controller_unittest.cc', + 'utility/screenshot_controller_unittest.cc', 'virtual_keyboard_controller_unittest.cc', 'wm/always_on_top_controller_unittest.cc', - 'wm/app_list_controller_unittest.cc', - 'wm/ash_native_cursor_manager_unittest.cc', 'wm/ash_focus_rules_unittest.cc', + 'wm/ash_native_cursor_manager_unittest.cc', 'wm/dock/docked_window_layout_manager_unittest.cc', 'wm/dock/docked_window_resizer_unittest.cc', 'wm/drag_window_resizer_unittest.cc', @@ -978,7 +945,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/app_list/app_list.gyp:app_list', - '../ui/app_list/shower/app_list_shower.gyp:app_list_shower', + '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter', '../ui/aura/aura.gyp:aura', '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', '../ui/base/ui_base.gyp:ui_base', @@ -992,6 +959,7 @@ '../ui/events/platform/events_platform.gyp:events_platform', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gfx/gfx.gyp:gfx_range', '../ui/gfx/gfx.gyp:gfx_vector_icons', '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', @@ -1004,6 +972,8 @@ '../url/url.gyp:url_lib', 'ash_resources.gyp:ash_resources', 'ash_strings.gyp:ash_strings', + 'wm/common/ash_wm_common.gyp:ash_wm_common', + 'wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources', ], 'defines': [ 'ASH_IMPLEMENTATION', @@ -1025,6 +995,8 @@ 'dependencies': [ '../build/linux/system.gyp:x11', '../build/linux/system.gyp:xfixes', + '../ui/base/x/ui_base_x.gyp:ui_base_x', + '../ui/events/devices/x11/events_devices_x11.gyp:events_devices_x11', '../ui/gfx/x/gfx_x11.gyp:gfx_x11', ], }], @@ -1083,6 +1055,7 @@ '../ui/aura/aura.gyp:aura', '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', + '../ui/display/display.gyp:display', '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -1096,6 +1069,7 @@ 'ash', 'ash_resources.gyp:ash_resources', 'ash_strings.gyp:ash_strings', + 'wm/common/ash_wm_common.gyp:ash_wm_common', ], 'defines': [ 'ASH_WITH_CONTENT_IMPLEMENTATION', @@ -1113,7 +1087,7 @@ '../testing/gtest.gyp:gtest', '../ui/accessibility/accessibility.gyp:ax_gen', '../ui/app_list/app_list.gyp:app_list_test_support', - '../ui/app_list/shower/app_list_shower.gyp:app_list_shower', + '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter', '../ui/events/devices/events_devices.gyp:events_devices', '../ui/views/views.gyp:views_test_support', 'ash', @@ -1176,7 +1150,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/app_list/app_list.gyp:app_list', - '../ui/app_list/shower/app_list_shower.gyp:app_list_shower', + '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', @@ -1210,6 +1184,7 @@ 'ash_strings.gyp:ash_test_strings', 'ash_test_support', 'ash_with_content', + 'wm/common/ash_wm_common.gyp:ash_wm_common', ], 'sources': [ '<@(ash_unittests_sources)', @@ -1276,7 +1251,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/app_list/app_list.gyp:app_list', - '../ui/app_list/shower/app_list_shower.gyp:app_list_shower', + '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter', '../ui/aura/aura.gyp:aura', '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', '../ui/base/ui_base.gyp:ui_base', @@ -1311,6 +1286,7 @@ '../content/content_shell_and_tests.gyp:content_shell_lib', '../content/content.gyp:content', '../skia/skia.gyp:skia', + 'wm/common/ash_wm_common.gyp:ash_wm_common', ], 'sources': [ '<@(ash_shell_with_content_lib_sources)', diff --git a/chromium/ash/ash_resources.gyp b/chromium/ash/ash_resources.gyp index 199d6a16756..0c51787448c 100644 --- a/chromium/ash/ash_resources.gyp +++ b/chromium/ash/ash_resources.gyp @@ -32,6 +32,7 @@ 'dependencies': [ '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 'ash_resources', + '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources', ], 'actions': [ { @@ -40,6 +41,7 @@ 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak', 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', ], @@ -53,12 +55,8 @@ 'pak_inputs': [ # TODO(msw): This seems bad, but follows repack_ui_test_pack's example. '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak', - ], - }], - ['enable_app_list==1', { - 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak', ], }], ], @@ -89,6 +87,7 @@ 'dependencies': [ '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 'ash_resources', + '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources', ], 'actions': [ { @@ -97,6 +96,7 @@ 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak', 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', ], 'conditions': [ @@ -107,12 +107,8 @@ }], ['toolkit_views==1', { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_200_percent.pak', - ], - }], - ['enable_app_list==1', { - 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_200_percent.pak', ], }], ], diff --git a/chromium/ash/wm/common/ash_wm_common.gyp b/chromium/ash/wm/common/ash_wm_common.gyp new file mode 100644 index 00000000000..9e56d91ba86 --- /dev/null +++ b/chromium/ash/wm/common/ash_wm_common.gyp @@ -0,0 +1,127 @@ +# Copyright 2016 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. + +{ + 'targets': [ + { + 'target_name': 'ash_wm_common', + 'type': '<(component)', + 'dependencies': [ + 'ash_wm_common_resources.gyp:ash_wm_common_resources', + '../../ash_resources.gyp:ash_resources', + '../../../base/base.gyp:base', + '../../../skia/skia.gyp:skia', + '../../../ui/aura/aura.gyp:aura', + '../../../ui/base/ui_base.gyp:ui_base', + '../../../ui/compositor/compositor.gyp:compositor', + '../../../ui/display/display.gyp:display', + '../../../ui/events/events.gyp:events', + '../../../ui/gfx/gfx.gyp:gfx', + '../../../ui/gfx/gfx.gyp:gfx_geometry', + '../../../ui/keyboard/keyboard.gyp:keyboard', + '../../../ui/views/views.gyp:views', + '../../../ui/wm/wm.gyp:wm', + ], + 'defines': [ + 'ASH_WM_COMMON_IMPLEMENTATION', + ], + 'sources': [ + 'always_on_top_controller.cc', + 'always_on_top_controller.h', + 'background_animator.cc', + 'background_animator.h', + 'container_finder.cc', + 'container_finder.h', + 'default_state.cc', + 'default_state.h', + 'default_window_resizer.cc', + 'default_window_resizer.h', + 'dock/docked_window_layout_manager.cc', + 'dock/docked_window_layout_manager.h', + 'dock/docked_window_layout_manager_observer.h', + 'dock/docked_window_resizer.cc', + 'dock/docked_window_resizer.h', + 'drag_details.cc', + 'drag_details.h', + 'fullscreen_window_finder.cc', + 'fullscreen_window_finder.h', + 'panels/panel_layout_manager.cc', + 'panels/panel_layout_manager.h', + 'panels/panel_window_resizer.cc', + 'panels/panel_window_resizer.h', + 'root_window_finder.cc', + 'root_window_finder.h', + 'shelf/wm_shelf.h', + 'shelf/wm_shelf_constants.cc', + 'shelf/wm_shelf_constants.h', + 'shelf/wm_shelf_observer.h', + 'shelf/wm_shelf_types.h', + 'shelf/wm_shelf_util.cc', + 'shelf/wm_shelf_util.h', + 'switchable_windows.cc', + 'switchable_windows.h', + 'window_animation_types.h', + 'window_parenting_utils.cc', + 'window_parenting_utils.h', + 'window_positioner.cc', + 'window_positioner.h', + 'window_positioning_utils.cc', + 'window_positioning_utils.h', + 'window_resizer.cc', + 'window_resizer.h', + 'window_state.cc', + 'window_state.h', + 'window_state_delegate.cc', + 'window_state_delegate.h', + 'window_state_observer.h', + 'window_state_util.cc', + 'window_state_util.h', + 'wm_activation_observer.h', + 'wm_display_observer.h', + 'wm_event.cc', + 'wm_event.h', + 'wm_globals.cc', + 'wm_globals.h', + 'wm_layout_manager.h', + 'wm_lookup.cc', + 'wm_lookup.h', + 'wm_overview_mode_observer.h', + 'wm_root_window_controller.h', + 'wm_root_window_controller_observer.h', + 'wm_screen_util.cc', + 'wm_screen_util.h', + 'wm_snap_to_pixel_layout_manager.cc', + 'wm_snap_to_pixel_layout_manager.h', + 'wm_types.cc', + 'wm_types.h', + 'wm_user_metrics_action.h', + 'wm_window.h', + 'wm_window_observer.h', + 'wm_window_property.h', + 'wm_window_tracker.h', + 'workspace/magnetism_matcher.cc', + 'workspace/magnetism_matcher.h', + 'workspace/multi_window_resize_controller.cc', + 'workspace/multi_window_resize_controller.h', + 'workspace/phantom_window_controller.cc', + 'workspace/phantom_window_controller.h', + 'workspace/two_step_edge_cycler.cc', + 'workspace/two_step_edge_cycler.h', + 'workspace/workspace_layout_manager.cc', + 'workspace/workspace_layout_manager.h', + 'workspace/workspace_layout_manager_backdrop_delegate.h', + 'workspace/workspace_layout_manager_delegate.h', + 'workspace/workspace_types.h', + 'workspace/workspace_window_resizer.cc', + 'workspace/workspace_window_resizer.h', + ], + 'conditions': [ + ['OS=="win"', { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + }], + ], + }, + ], +} diff --git a/chromium/ash/wm/common/ash_wm_common_resources.gyp b/chromium/ash/wm/common/ash_wm_common_resources.gyp new file mode 100644 index 00000000000..19567fcb720 --- /dev/null +++ b/chromium/ash/wm/common/ash_wm_common_resources.gyp @@ -0,0 +1,26 @@ +# Copyright 2016 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. + +{ + 'targets': [ + { + # GN version: //ash/wm/common/resources + 'target_name': 'ash_wm_common_resources', + 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources', + }, + 'actions': [ + { + 'action_name': 'ash_wm_common_resources', + 'variables': { + 'grit_grd_file': 'resources/ash_wm_common_resources.grd', + }, + 'includes': [ '../../../build/grit_action.gypi' ], + }, + ], + 'includes': [ '../../../build/grit_target.gypi' ], + }, + ], +} |