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

Side by Side Diff: ash/ash.gyp

Issue 759063002: Move Screen Rotation from MaximizeModeController to ScreenOrientationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change similarity to account for moved files Created 6 years 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 29 matching lines...) Expand all
40 'autoclick/autoclick_controller.h', 40 'autoclick/autoclick_controller.h',
41 'ash_constants.cc', 41 'ash_constants.cc',
42 'ash_constants.h', 42 'ash_constants.h',
43 'ash_export.h', 43 'ash_export.h',
44 'ash_switches.cc', 44 'ash_switches.cc',
45 'ash_switches.h', 45 'ash_switches.h',
46 'ash_touch_exploration_manager_chromeos.cc', 46 'ash_touch_exploration_manager_chromeos.cc',
47 'ash_touch_exploration_manager_chromeos.h', 47 'ash_touch_exploration_manager_chromeos.h',
48 'cancel_mode.cc', 48 'cancel_mode.cc',
49 'cancel_mode.h', 49 'cancel_mode.h',
50 'content/display/screen_orientation_delegate_chromeos.cc', 50 'content/display/screen_orientation_controller_chromeos.cc',
51 'content/display/screen_orientation_delegate_chromeos.h', 51 'content/display/screen_orientation_controller_chromeos.h',
52 'debug.cc', 52 'debug.cc',
53 'debug.h', 53 'debug.h',
54 'default_accessibility_delegate.cc', 54 'default_accessibility_delegate.cc',
55 'default_accessibility_delegate.h', 55 'default_accessibility_delegate.h',
56 'default_user_wallpaper_delegate.cc', 56 'default_user_wallpaper_delegate.cc',
57 'default_user_wallpaper_delegate.h', 57 'default_user_wallpaper_delegate.h',
58 'desktop_background/desktop_background_controller.cc', 58 'desktop_background/desktop_background_controller.cc',
59 'desktop_background/desktop_background_controller.h', 59 'desktop_background/desktop_background_controller.h',
60 'desktop_background/desktop_background_controller_observer.h', 60 'desktop_background/desktop_background_controller_observer.h',
61 'desktop_background/desktop_background_view.cc', 61 'desktop_background/desktop_background_view.cc',
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 ], 758 ],
759 'ash_unittests_sources': [ 759 'ash_unittests_sources': [
760 'accelerators/accelerator_commands_unittest.cc', 760 'accelerators/accelerator_commands_unittest.cc',
761 'accelerators/accelerator_controller_unittest.cc', 761 'accelerators/accelerator_controller_unittest.cc',
762 'accelerators/accelerator_filter_unittest.cc', 762 'accelerators/accelerator_filter_unittest.cc',
763 'accelerators/accelerator_table_unittest.cc', 763 'accelerators/accelerator_table_unittest.cc',
764 'accelerators/magnifier_key_scroller_unittest.cc', 764 'accelerators/magnifier_key_scroller_unittest.cc',
765 'accelerators/spoken_feedback_toggler_unittest.cc', 765 'accelerators/spoken_feedback_toggler_unittest.cc',
766 'ash_touch_exploration_manager_chromeos_unittest.cc', 766 'ash_touch_exploration_manager_chromeos_unittest.cc',
767 'autoclick/autoclick_unittest.cc', 767 'autoclick/autoclick_unittest.cc',
768 'content/display/screen_orientation_delegate_chromeos_unittest.cc', 768 'content/display/screen_orientation_controller_chromeos_unittest.cc',
769 'desktop_background/desktop_background_controller_unittest.cc', 769 'desktop_background/desktop_background_controller_unittest.cc',
770 'desktop_background/wallpaper_resizer_unittest.cc', 770 'desktop_background/wallpaper_resizer_unittest.cc',
771 'dip_unittest.cc', 771 'dip_unittest.cc',
772 'display/display_change_observer_chromeos_unittest.cc', 772 'display/display_change_observer_chromeos_unittest.cc',
773 'display/display_controller_unittest.cc', 773 'display/display_controller_unittest.cc',
774 'display/display_error_observer_chromeos_unittest.cc', 774 'display/display_error_observer_chromeos_unittest.cc',
775 'display/display_info_unittest.cc', 775 'display/display_info_unittest.cc',
776 'display/display_manager_unittest.cc', 776 'display/display_manager_unittest.cc',
777 'display/mirror_window_controller_unittest.cc', 777 'display/mirror_window_controller_unittest.cc',
778 'display/mouse_cursor_event_filter_unittest.cc', 778 'display/mouse_cursor_event_filter_unittest.cc',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 '../chromeos/chromeos.gyp:power_manager_proto', 958 '../chromeos/chromeos.gyp:power_manager_proto',
959 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 959 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
960 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 960 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
961 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 961 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
962 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 962 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
963 '../ui/display/display.gyp:display', 963 '../ui/display/display.gyp:display',
964 '../ui/display/display.gyp:display_util', 964 '../ui/display/display.gyp:display_util',
965 ], 965 ],
966 }, { # else: chromeos!=1 966 }, { # else: chromeos!=1
967 'sources!': [ 967 'sources!': [
968 'content/display/screen_orientation_controller_chromeos.cc',
969 'content/display/screen_orientation_controller_chromeos.h',
flackr 2014/12/12 20:46:06 We have to explicitly exclude these files? Shouldn
jonross 2015/01/06 19:56:10 Did not know of those. Removed
968 'display/display_configurator_animation.cc', 970 'display/display_configurator_animation.cc',
969 'display/display_configurator_animation.h', 971 'display/display_configurator_animation.h',
970 'display/resolution_notification_controller.cc', 972 'display/resolution_notification_controller.cc',
971 'display/resolution_notification_controller.h', 973 'display/resolution_notification_controller.h',
972 'system/tray/media_security/media_capture_observer.h', 974 'system/tray/media_security/media_capture_observer.h',
973 'system/tray/media_security/multi_profile_media_tray_item.cc', 975 'system/tray/media_security/multi_profile_media_tray_item.cc',
974 'system/tray/media_security/multi_profile_media_tray_item.h', 976 'system/tray/media_security/multi_profile_media_tray_item.h',
975 'touch/touch_transformer_controller.cc', 977 'touch/touch_transformer_controller.cc',
976 'touch/touch_transformer_controller.h', 978 'touch/touch_transformer_controller.h',
977 'touch/touchscreen_util.cc', 979 'touch/touchscreen_util.cc',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 'ash_strings.gyp:ash_strings', 1105 'ash_strings.gyp:ash_strings',
1104 'ash_test_support', 1106 'ash_test_support',
1105 'ash_with_content', 1107 'ash_with_content',
1106 ], 1108 ],
1107 'sources': [ 1109 'sources': [
1108 '<@(ash_unittests_sources)', 1110 '<@(ash_unittests_sources)',
1109 ], 1111 ],
1110 'conditions': [ 1112 'conditions': [
1111 ['chromeos==0', { 1113 ['chromeos==0', {
1112 'sources!': [ 1114 'sources!': [
1113 'content/display/screen_orientation_delegate_chromeos_unittest.cc', 1115 'content/display/screen_orientation_controller_chromeos_unittest.cc' ,
1114 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1116 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1115 'focus_cycler_unittest.cc', 1117 'focus_cycler_unittest.cc',
1116 # All tests for multiple displays: not supported on Windows Ash. 1118 # All tests for multiple displays: not supported on Windows Ash.
1117 'wm/drag_window_resizer_unittest.cc', 1119 'wm/drag_window_resizer_unittest.cc',
1118 # Can't resize on Windows Ash. http://crbug.com/165962 1120 # Can't resize on Windows Ash. http://crbug.com/165962
1119 'magnifier/magnification_controller_unittest.cc', 1121 'magnifier/magnification_controller_unittest.cc',
1120 'wm/workspace/workspace_window_resizer_unittest.cc', 1122 'wm/workspace/workspace_window_resizer_unittest.cc',
1121 'sticky_keys/sticky_keys_overlay_unittest.cc', 1123 'sticky_keys/sticky_keys_overlay_unittest.cc',
1122 'sticky_keys/sticky_keys_unittest.cc', 1124 'sticky_keys/sticky_keys_unittest.cc',
1125 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
1123 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c', 1126 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c',
1124 'autoclick/autoclick_unittest.cc', 1127 'autoclick/autoclick_unittest.cc',
1125 "virtual_keyboard_controller_unittest.cc" 1128 "virtual_keyboard_controller_unittest.cc"
1126 ], 1129 ],
1127 'sources': [ 1130 'sources': [
1128 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 1131 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1129 ], 1132 ],
1130 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1133 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1131 'msvs_disabled_warnings': [ 4267, ], 1134 'msvs_disabled_warnings': [ 4267, ],
1132 }], 1135 }],
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 '../build/isolate.gypi', 1302 '../build/isolate.gypi',
1300 ], 1303 ],
1301 'sources': [ 1304 'sources': [
1302 'ash_unittests.isolate', 1305 'ash_unittests.isolate',
1303 ], 1306 ],
1304 }, 1307 },
1305 ], 1308 ],
1306 }], 1309 }],
1307 ], 1310 ],
1308 } 1311 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698