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

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: Fix Linux Compile Created 5 years, 11 months 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
« no previous file with comments | « no previous file | ash/content/display/screen_orientation_controller_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
37 'autoclick/autoclick_controller.h', 37 'autoclick/autoclick_controller.h',
38 'ash_constants.cc', 38 'ash_constants.cc',
39 'ash_constants.h', 39 'ash_constants.h',
40 'ash_export.h', 40 'ash_export.h',
41 'ash_switches.cc', 41 'ash_switches.cc',
42 'ash_switches.h', 42 'ash_switches.h',
43 'ash_touch_exploration_manager_chromeos.cc', 43 'ash_touch_exploration_manager_chromeos.cc',
44 'ash_touch_exploration_manager_chromeos.h', 44 'ash_touch_exploration_manager_chromeos.h',
45 'cancel_mode.cc', 45 'cancel_mode.cc',
46 'cancel_mode.h', 46 'cancel_mode.h',
47 'content/display/screen_orientation_delegate_chromeos.cc', 47 'content/display/screen_orientation_controller_chromeos.cc',
48 'content/display/screen_orientation_delegate_chromeos.h', 48 'content/display/screen_orientation_controller_chromeos.h',
49 'debug.cc', 49 'debug.cc',
50 'debug.h', 50 'debug.h',
51 'default_accessibility_delegate.cc', 51 'default_accessibility_delegate.cc',
52 'default_accessibility_delegate.h', 52 'default_accessibility_delegate.h',
53 'default_user_wallpaper_delegate.cc', 53 'default_user_wallpaper_delegate.cc',
54 'default_user_wallpaper_delegate.h', 54 'default_user_wallpaper_delegate.h',
55 'desktop_background/desktop_background_controller.cc', 55 'desktop_background/desktop_background_controller.cc',
56 'desktop_background/desktop_background_controller.h', 56 'desktop_background/desktop_background_controller.h',
57 'desktop_background/desktop_background_controller_observer.h', 57 'desktop_background/desktop_background_controller_observer.h',
58 'desktop_background/desktop_background_view.cc', 58 'desktop_background/desktop_background_view.cc',
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 ], 750 ],
751 'ash_unittests_sources': [ 751 'ash_unittests_sources': [
752 'accelerators/accelerator_commands_unittest.cc', 752 'accelerators/accelerator_commands_unittest.cc',
753 'accelerators/accelerator_controller_unittest.cc', 753 'accelerators/accelerator_controller_unittest.cc',
754 'accelerators/accelerator_filter_unittest.cc', 754 'accelerators/accelerator_filter_unittest.cc',
755 'accelerators/accelerator_table_unittest.cc', 755 'accelerators/accelerator_table_unittest.cc',
756 'accelerators/magnifier_key_scroller_unittest.cc', 756 'accelerators/magnifier_key_scroller_unittest.cc',
757 'accelerators/spoken_feedback_toggler_unittest.cc', 757 'accelerators/spoken_feedback_toggler_unittest.cc',
758 'ash_touch_exploration_manager_chromeos_unittest.cc', 758 'ash_touch_exploration_manager_chromeos_unittest.cc',
759 'autoclick/autoclick_unittest.cc', 759 'autoclick/autoclick_unittest.cc',
760 'content/display/screen_orientation_delegate_chromeos_unittest.cc', 760 'content/display/screen_orientation_controller_chromeos_unittest.cc',
761 'desktop_background/desktop_background_controller_unittest.cc', 761 'desktop_background/desktop_background_controller_unittest.cc',
762 'dip_unittest.cc', 762 'dip_unittest.cc',
763 'display/display_change_observer_chromeos_unittest.cc', 763 'display/display_change_observer_chromeos_unittest.cc',
764 'display/display_controller_unittest.cc', 764 'display/display_controller_unittest.cc',
765 'display/display_error_observer_chromeos_unittest.cc', 765 'display/display_error_observer_chromeos_unittest.cc',
766 'display/display_info_unittest.cc', 766 'display/display_info_unittest.cc',
767 'display/display_manager_unittest.cc', 767 'display/display_manager_unittest.cc',
768 'display/mirror_window_controller_unittest.cc', 768 'display/mirror_window_controller_unittest.cc',
769 'display/mouse_cursor_event_filter_unittest.cc', 769 'display/mouse_cursor_event_filter_unittest.cc',
770 'display/projecting_observer_chromeos_unittest.cc', 770 'display/projecting_observer_chromeos_unittest.cc',
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 'ash_strings.gyp:ash_strings', 1089 'ash_strings.gyp:ash_strings',
1090 'ash_test_support', 1090 'ash_test_support',
1091 'ash_with_content', 1091 'ash_with_content',
1092 ], 1092 ],
1093 'sources': [ 1093 'sources': [
1094 '<@(ash_unittests_sources)', 1094 '<@(ash_unittests_sources)',
1095 ], 1095 ],
1096 'conditions': [ 1096 'conditions': [
1097 ['chromeos==0', { 1097 ['chromeos==0', {
1098 'sources!': [ 1098 'sources!': [
1099 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
1100 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1099 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1101 'focus_cycler_unittest.cc', 1100 'focus_cycler_unittest.cc',
1102 # All tests for multiple displays: not supported on Windows Ash. 1101 # All tests for multiple displays: not supported on Windows Ash.
1103 'wm/drag_window_resizer_unittest.cc', 1102 'wm/drag_window_resizer_unittest.cc',
1104 # Can't resize on Windows Ash. http://crbug.com/165962 1103 # Can't resize on Windows Ash. http://crbug.com/165962
1105 'magnifier/magnification_controller_unittest.cc', 1104 'magnifier/magnification_controller_unittest.cc',
1106 'wm/maximize_mode/maximize_mode_controller_unittest.cc', 1105 'wm/maximize_mode/maximize_mode_controller_unittest.cc',
1107 'wm/workspace/workspace_window_resizer_unittest.cc', 1106 'wm/workspace/workspace_window_resizer_unittest.cc',
1108 'sticky_keys/sticky_keys_overlay_unittest.cc', 1107 'sticky_keys/sticky_keys_overlay_unittest.cc',
1109 'sticky_keys/sticky_keys_unittest.cc', 1108 'sticky_keys/sticky_keys_unittest.cc',
1109 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
1110 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c', 1110 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c',
1111 'autoclick/autoclick_unittest.cc', 1111 'autoclick/autoclick_unittest.cc',
1112 "virtual_keyboard_controller_unittest.cc" 1112 "virtual_keyboard_controller_unittest.cc"
1113 ], 1113 ],
1114 'sources': [ 1114 'sources': [
1115 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 1115 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1116 ], 1116 ],
1117 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1117 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1118 'msvs_disabled_warnings': [ 4267, ], 1118 'msvs_disabled_warnings': [ 4267, ],
1119 }], 1119 }],
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 '../build/isolate.gypi', 1282 '../build/isolate.gypi',
1283 ], 1283 ],
1284 'sources': [ 1284 'sources': [
1285 'ash_unittests.isolate', 1285 'ash_unittests.isolate',
1286 ], 1286 ],
1287 }, 1287 },
1288 ], 1288 ],
1289 }], 1289 }],
1290 ], 1290 ],
1291 } 1291 }
OLDNEW
« no previous file with comments | « no previous file | ash/content/display/screen_orientation_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698