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

Side by Side Diff: ash/ash.gyp

Issue 723633003: Reland ScreenOrientationDelegate on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS build error Created 6 years, 1 month 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/DEPS » ('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 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',
51 'content/display/screen_orientation_delegate_chromeos.h',
50 'debug.cc', 52 'debug.cc',
51 'debug.h', 53 'debug.h',
52 'default_accessibility_delegate.cc', 54 'default_accessibility_delegate.cc',
53 'default_accessibility_delegate.h', 55 'default_accessibility_delegate.h',
54 'default_user_wallpaper_delegate.cc', 56 'default_user_wallpaper_delegate.cc',
55 'default_user_wallpaper_delegate.h', 57 'default_user_wallpaper_delegate.h',
56 'desktop_background/desktop_background_controller.cc', 58 'desktop_background/desktop_background_controller.cc',
57 'desktop_background/desktop_background_controller.h', 59 'desktop_background/desktop_background_controller.h',
58 'desktop_background/desktop_background_controller_observer.h', 60 'desktop_background/desktop_background_controller_observer.h',
59 'desktop_background/desktop_background_view.cc', 61 'desktop_background/desktop_background_view.cc',
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 ], 766 ],
765 'ash_unittests_sources': [ 767 'ash_unittests_sources': [
766 'accelerators/accelerator_commands_unittest.cc', 768 'accelerators/accelerator_commands_unittest.cc',
767 'accelerators/accelerator_controller_unittest.cc', 769 'accelerators/accelerator_controller_unittest.cc',
768 'accelerators/accelerator_filter_unittest.cc', 770 'accelerators/accelerator_filter_unittest.cc',
769 'accelerators/accelerator_table_unittest.cc', 771 'accelerators/accelerator_table_unittest.cc',
770 'accelerators/magnifier_key_scroller_unittest.cc', 772 'accelerators/magnifier_key_scroller_unittest.cc',
771 'accelerators/spoken_feedback_toggler_unittest.cc', 773 'accelerators/spoken_feedback_toggler_unittest.cc',
772 'ash_touch_exploration_manager_chromeos_unittest.cc', 774 'ash_touch_exploration_manager_chromeos_unittest.cc',
773 'autoclick/autoclick_unittest.cc', 775 'autoclick/autoclick_unittest.cc',
776 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
774 'desktop_background/desktop_background_controller_unittest.cc', 777 'desktop_background/desktop_background_controller_unittest.cc',
775 'desktop_background/wallpaper_resizer_unittest.cc', 778 'desktop_background/wallpaper_resizer_unittest.cc',
776 'dip_unittest.cc', 779 'dip_unittest.cc',
777 'display/display_change_observer_chromeos_unittest.cc', 780 'display/display_change_observer_chromeos_unittest.cc',
778 'display/display_controller_unittest.cc', 781 'display/display_controller_unittest.cc',
779 'display/display_error_observer_chromeos_unittest.cc', 782 'display/display_error_observer_chromeos_unittest.cc',
780 'display/display_info_unittest.cc', 783 'display/display_info_unittest.cc',
781 'display/display_manager_unittest.cc', 784 'display/display_manager_unittest.cc',
782 'display/mirror_window_controller_unittest.cc', 785 'display/mirror_window_controller_unittest.cc',
783 'display/mouse_cursor_event_filter_unittest.cc', 786 'display/mouse_cursor_event_filter_unittest.cc',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 'ash_strings.gyp:ash_strings', 1115 'ash_strings.gyp:ash_strings',
1113 'ash_test_support', 1116 'ash_test_support',
1114 'ash_with_content', 1117 'ash_with_content',
1115 ], 1118 ],
1116 'sources': [ 1119 'sources': [
1117 '<@(ash_unittests_sources)', 1120 '<@(ash_unittests_sources)',
1118 ], 1121 ],
1119 'conditions': [ 1122 'conditions': [
1120 ['chromeos==0', { 1123 ['chromeos==0', {
1121 'sources!': [ 1124 'sources!': [
1125 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
1122 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1126 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1123 'focus_cycler_unittest.cc', 1127 'focus_cycler_unittest.cc',
1124 # All tests for multiple displays: not supported on Windows Ash. 1128 # All tests for multiple displays: not supported on Windows Ash.
1125 'wm/drag_window_resizer_unittest.cc', 1129 'wm/drag_window_resizer_unittest.cc',
1126 # Can't resize on Windows Ash. http://crbug.com/165962 1130 # Can't resize on Windows Ash. http://crbug.com/165962
1127 'magnifier/magnification_controller_unittest.cc', 1131 'magnifier/magnification_controller_unittest.cc',
1128 'wm/workspace/workspace_window_resizer_unittest.cc', 1132 'wm/workspace/workspace_window_resizer_unittest.cc',
1129 'sticky_keys/sticky_keys_overlay_unittest.cc', 1133 'sticky_keys/sticky_keys_overlay_unittest.cc',
1130 'sticky_keys/sticky_keys_unittest.cc', 1134 'sticky_keys/sticky_keys_unittest.cc',
1131 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c', 1135 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c',
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 '../build/isolate.gypi', 1311 '../build/isolate.gypi',
1308 ], 1312 ],
1309 'sources': [ 1313 'sources': [
1310 'ash_unittests.isolate', 1314 'ash_unittests.isolate',
1311 ], 1315 ],
1312 }, 1316 },
1313 ], 1317 ],
1314 }], 1318 }],
1315 ], 1319 ],
1316 } 1320 }
OLDNEW
« no previous file with comments | « no previous file | ash/content/display/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698