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

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: 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 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 '../chromeos/chromeos.gyp:power_manager_proto', 957 '../chromeos/chromeos.gyp:power_manager_proto',
958 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 958 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
959 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 959 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
960 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 960 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
961 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 961 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
962 '../ui/display/display.gyp:display', 962 '../ui/display/display.gyp:display',
963 '../ui/display/display.gyp:display_util', 963 '../ui/display/display.gyp:display_util',
964 ], 964 ],
965 }, { # else: chromeos!=1 965 }, { # else: chromeos!=1
966 'sources!': [ 966 'sources!': [
967 'content/display/screen_orientation_delegate_chromeos.cc',
968 'content/display/screen_orientation_delegate_chromeos.h',
967 'display/display_configurator_animation.cc', 969 'display/display_configurator_animation.cc',
968 'display/display_configurator_animation.h', 970 'display/display_configurator_animation.h',
969 'display/resolution_notification_controller.cc', 971 'display/resolution_notification_controller.cc',
970 'display/resolution_notification_controller.h', 972 'display/resolution_notification_controller.h',
971 'system/tray/media_security/media_capture_observer.h', 973 'system/tray/media_security/media_capture_observer.h',
972 'system/tray/media_security/multi_profile_media_tray_item.cc', 974 'system/tray/media_security/multi_profile_media_tray_item.cc',
973 'system/tray/media_security/multi_profile_media_tray_item.h', 975 'system/tray/media_security/multi_profile_media_tray_item.h',
974 'touch/touch_transformer_controller.cc', 976 'touch/touch_transformer_controller.cc',
975 'touch/touch_transformer_controller.h', 977 'touch/touch_transformer_controller.h',
976 'touch/touchscreen_util.cc', 978 'touch/touchscreen_util.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 'content/display/screen_orientation_delegate_chromeos_unittest.cc', 1114 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
1113 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1115 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1114 'focus_cycler_unittest.cc', 1116 'focus_cycler_unittest.cc',
1115 # All tests for multiple displays: not supported on Windows Ash. 1117 # All tests for multiple displays: not supported on Windows Ash.
1116 'wm/drag_window_resizer_unittest.cc', 1118 'wm/drag_window_resizer_unittest.cc',
1117 # Can't resize on Windows Ash. http://crbug.com/165962 1119 # Can't resize on Windows Ash. http://crbug.com/165962
1118 'magnifier/magnification_controller_unittest.cc', 1120 'magnifier/magnification_controller_unittest.cc',
1119 'wm/workspace/workspace_window_resizer_unittest.cc', 1121 'wm/workspace/workspace_window_resizer_unittest.cc',
1120 'sticky_keys/sticky_keys_overlay_unittest.cc', 1122 'sticky_keys/sticky_keys_overlay_unittest.cc',
1121 'sticky_keys/sticky_keys_unittest.cc', 1123 'sticky_keys/sticky_keys_unittest.cc',
1124 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
1122 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c', 1125 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c',
1123 'autoclick/autoclick_unittest.cc', 1126 'autoclick/autoclick_unittest.cc',
1124 "virtual_keyboard_controller_unittest.cc" 1127 "virtual_keyboard_controller_unittest.cc"
1125 ], 1128 ],
1126 'sources': [ 1129 'sources': [
1127 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 1130 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1128 ], 1131 ],
1129 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1132 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1130 'msvs_disabled_warnings': [ 4267, ], 1133 'msvs_disabled_warnings': [ 4267, ],
1131 }], 1134 }],
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 '../build/isolate.gypi', 1301 '../build/isolate.gypi',
1299 ], 1302 ],
1300 'sources': [ 1303 'sources': [
1301 'ash_unittests.isolate', 1304 'ash_unittests.isolate',
1302 ], 1305 ],
1303 }, 1306 },
1304 ], 1307 ],
1305 }], 1308 }],
1306 ], 1309 ],
1307 } 1310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698