X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fash%2Fash.gyp;h=60e980e4a73551e2781cc404fbb6a8b17535d30f;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=6c6b8a3478d39de640ddd5660b2dee67e7ac70e9;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ash/ash.gyp b/src/ash/ash.gyp index 6c6b8a3..60e980e 100644 --- a/src/ash/ash.gyp +++ b/src/ash/ash.gyp @@ -40,6 +40,7 @@ 'autoclick/autoclick_controller.h', 'ash_constants.cc', 'ash_constants.h', + 'ash_export.h', 'ash_switches.cc', 'ash_switches.h', 'ash_touch_exploration_manager_chromeos.cc', @@ -88,7 +89,6 @@ 'display/mirror_window_controller.h', 'display/mouse_cursor_event_filter.cc', 'display/mouse_cursor_event_filter.h', - 'display/mouse_cursor_event_filter_ozone.cc', 'display/projecting_observer_chromeos.cc', 'display/projecting_observer_chromeos.h', 'display/resolution_notification_controller.cc', @@ -101,8 +101,6 @@ 'display/screen_position_controller.h', 'display/shared_display_edge_indicator.cc', 'display/shared_display_edge_indicator.h', - 'display/virtual_keyboard_window_controller.cc', - 'display/virtual_keyboard_window_controller.h', 'drag_drop/drag_drop_controller.cc', 'drag_drop/drag_drop_controller.h', 'drag_drop/drag_drop_tracker.cc', @@ -291,6 +289,8 @@ 'system/chromeos/keyboard_brightness_controller.h', 'system/chromeos/label_tray_view.cc', 'system/chromeos/label_tray_view.h', + 'system/chromeos/multi_user/user_switch_util.cc', + 'system/chromeos/multi_user/user_switch_util.h', 'system/chromeos/network/network_connect.cc', 'system/chromeos/network/network_connect.h', 'system/chromeos/network/network_detailed_view.h', @@ -478,6 +478,10 @@ 'touch/touch_transformer_controller.h', 'touch/touch_uma.cc', 'touch/touch_uma.h', + 'touch/touchscreen_util.cc', + 'touch/touchscreen_util.h', + 'virtual_keyboard_controller.cc', + 'virtual_keyboard_controller.h', 'volume_control_delegate.h', 'wm/app_list_controller.cc', 'wm/app_list_controller.h', @@ -593,6 +597,8 @@ 'wm/screen_dimmer.h', 'wm/session_state_animator.cc', 'wm/session_state_animator.h', + 'wm/session_state_animator_impl.cc', + 'wm/session_state_animator_impl.h', 'wm/stacking_controller.cc', 'wm/stacking_controller.h', 'wm/status_area_layout_manager.cc', @@ -610,6 +616,8 @@ 'wm/toplevel_window_event_handler.h', 'wm/video_detector.cc', 'wm/video_detector.h', + "wm/virtual_keyboard_container_layout_manager.cc", + "wm/virtual_keyboard_container_layout_manager.h", 'wm/window_animations.cc', 'wm/window_animations.h', 'wm/window_positioner.cc', @@ -693,6 +701,8 @@ 'test/test_overlay_delegate.h', 'test/test_screenshot_delegate.cc', 'test/test_screenshot_delegate.h', + 'test/test_session_state_animator.cc', + 'test/test_session_state_animator.h', 'test/test_session_state_delegate.cc', 'test/test_session_state_delegate.h', 'test/test_shelf_delegate.cc', @@ -715,7 +725,6 @@ 'test/ui_controls_factory_ash.h', ], 'ash_shell_lib_sources': [ - '../content/app/startup_helper_win.cc', '../ui/views/test/test_views_delegate_aura.cc', 'shell/app_list.cc', 'shell/bubble.cc', @@ -767,7 +776,6 @@ 'display/display_info_unittest.cc', 'display/display_manager_unittest.cc', 'display/mirror_window_controller_unittest.cc', - 'display/virtual_keyboard_window_controller_unittest.cc', 'display/mouse_cursor_event_filter_unittest.cc', 'display/projecting_observer_chromeos_unittest.cc', 'display/resolution_notification_controller_unittest.cc', @@ -811,6 +819,7 @@ 'system/chromeos/power/power_status_view_unittest.cc', 'system/chromeos/power/tray_power_unittest.cc', 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', + 'system/chromeos/multi_user/user_switch_util_unittest.cc', 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 'system/chromeos/session/logout_confirmation_controller_unittest.cc', 'system/chromeos/session/tray_session_length_limit_unittest.cc', @@ -829,6 +838,8 @@ 'tooltips/tooltip_controller_unittest.cc', 'touch/touch_observer_hud_unittest.cc', 'touch/touch_transformer_controller_unittest.cc', + 'touch/touchscreen_util_unittest.cc', + 'virtual_keyboard_controller_unittest.cc', 'wm/app_list_controller_unittest.cc', 'wm/ash_native_cursor_manager_unittest.cc', 'wm/dock/docked_window_layout_manager_unittest.cc', @@ -860,8 +871,6 @@ 'wm/window_positioner_unittest.cc', 'wm/window_state_unittest.cc', 'wm/window_util_unittest.cc', - 'wm/maximize_mode/workspace_backdrop_delegate.cc', - 'wm/maximize_mode/workspace_backdrop_delegate.h', 'wm/overlay_event_filter_unittest.cc', 'wm/workspace/magnetism_matcher_unittest.cc', 'wm/workspace/multi_window_resize_controller_unittest.cc', @@ -892,6 +901,7 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', @@ -969,6 +979,8 @@ 'system/tray/media_security/multi_profile_media_tray_item.h', 'touch/touch_transformer_controller.cc', 'touch/touch_transformer_controller.h', + 'touch/touchscreen_util.cc', + 'touch/touchscreen_util.h', ], }], ], @@ -1063,6 +1075,7 @@ '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', @@ -1101,10 +1114,8 @@ # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 'focus_cycler_unittest.cc', # All tests for multiple displays: not supported on Windows Ash. - 'accelerators/nested_dispatcher_controller_unittest.cc', 'wm/drag_window_resizer_unittest.cc', # Can't resize on Windows Ash. http://crbug.com/165962 - 'ash_root_window_transformer_unittest.cc', 'magnifier/magnification_controller_unittest.cc', 'wm/workspace/workspace_window_resizer_unittest.cc', 'sticky_keys/sticky_keys_overlay_unittest.cc', @@ -1146,6 +1157,7 @@ 'sources!': [ 'display/resolution_notification_controller_unittest.cc', 'touch/touch_transformer_controller_unittest.cc', + 'touch/touchscreen_util_unittest.cc', ], }], ['OS=="linux" and component=="shared_library" and use_allocator!="none"', { @@ -1199,6 +1211,13 @@ 'sources': [ '<@(ash_shell_lib_sources)', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../content/content.gyp:content_startup_helper_win', + ], + }], + ], }, { # GN version: //ash:ash_shell