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

Side by Side Diff: ash/ash.gyp

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 3 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 | Annotate | Revision Log
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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 'touch/touch_hud_debug.cc', 473 'touch/touch_hud_debug.cc',
474 'touch/touch_hud_debug.h', 474 'touch/touch_hud_debug.h',
475 'touch/touch_hud_projection.cc', 475 'touch/touch_hud_projection.cc',
476 'touch/touch_hud_projection.h', 476 'touch/touch_hud_projection.h',
477 'touch/touch_observer_hud.cc', 477 'touch/touch_observer_hud.cc',
478 'touch/touch_observer_hud.h', 478 'touch/touch_observer_hud.h',
479 'touch/touch_transformer_controller.cc', 479 'touch/touch_transformer_controller.cc',
480 'touch/touch_transformer_controller.h', 480 'touch/touch_transformer_controller.h',
481 'touch/touch_uma.cc', 481 'touch/touch_uma.cc',
482 'touch/touch_uma.h', 482 'touch/touch_uma.h',
483 'touch/touchscreen_util.cc',
484 'touch/touchscreen_util.h',
483 'volume_control_delegate.h', 485 'volume_control_delegate.h',
484 'wm/app_list_controller.cc', 486 'wm/app_list_controller.cc',
485 'wm/app_list_controller.h', 487 'wm/app_list_controller.h',
486 'wm/always_on_top_controller.cc', 488 'wm/always_on_top_controller.cc',
487 'wm/always_on_top_controller.h', 489 'wm/always_on_top_controller.h',
488 'wm/ash_native_cursor_manager.cc', 490 'wm/ash_native_cursor_manager.cc',
489 'wm/ash_native_cursor_manager.h', 491 'wm/ash_native_cursor_manager.h',
490 'wm/ash_focus_rules.cc', 492 'wm/ash_focus_rules.cc',
491 'wm/ash_focus_rules.h', 493 'wm/ash_focus_rules.h',
492 'wm/boot_splash_screen_chromeos.cc', 494 'wm/boot_splash_screen_chromeos.cc',
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 'system/tray/system_tray_unittest.cc', 826 'system/tray/system_tray_unittest.cc',
825 'system/tray/tray_details_view_unittest.cc', 827 'system/tray/tray_details_view_unittest.cc',
826 'system/user/tray_user_unittest.cc', 828 'system/user/tray_user_unittest.cc',
827 'system/web_notification/ash_popup_alignment_delegate_unittest.cc', 829 'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
828 'system/web_notification/web_notification_tray_unittest.cc', 830 'system/web_notification/web_notification_tray_unittest.cc',
829 'test/ash_test_helper_unittest.cc', 831 'test/ash_test_helper_unittest.cc',
830 'test/ash_unittests.cc', 832 'test/ash_unittests.cc',
831 'tooltips/tooltip_controller_unittest.cc', 833 'tooltips/tooltip_controller_unittest.cc',
832 'touch/touch_observer_hud_unittest.cc', 834 'touch/touch_observer_hud_unittest.cc',
833 'touch/touch_transformer_controller_unittest.cc', 835 'touch/touch_transformer_controller_unittest.cc',
836 'touch/touchscreen_util_unittest.cc',
834 'wm/app_list_controller_unittest.cc', 837 'wm/app_list_controller_unittest.cc',
835 'wm/ash_native_cursor_manager_unittest.cc', 838 'wm/ash_native_cursor_manager_unittest.cc',
836 'wm/dock/docked_window_layout_manager_unittest.cc', 839 'wm/dock/docked_window_layout_manager_unittest.cc',
837 'wm/dock/docked_window_resizer_unittest.cc', 840 'wm/dock/docked_window_resizer_unittest.cc',
838 'wm/drag_window_resizer_unittest.cc', 841 'wm/drag_window_resizer_unittest.cc',
839 'wm/gestures/overview_gesture_handler_unittest.cc', 842 'wm/gestures/overview_gesture_handler_unittest.cc',
840 'wm/immersive_fullscreen_controller_unittest.cc', 843 'wm/immersive_fullscreen_controller_unittest.cc',
841 'wm/lock_layout_manager_unittest.cc', 844 'wm/lock_layout_manager_unittest.cc',
842 'wm/lock_state_controller_unittest.cc', 845 'wm/lock_state_controller_unittest.cc',
843 'wm/maximize_mode/accelerometer_test_data_literals.cc', 846 'wm/maximize_mode/accelerometer_test_data_literals.cc',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 'sources!': [ 968 'sources!': [
966 'display/display_configurator_animation.cc', 969 'display/display_configurator_animation.cc',
967 'display/display_configurator_animation.h', 970 'display/display_configurator_animation.h',
968 'display/resolution_notification_controller.cc', 971 'display/resolution_notification_controller.cc',
969 'display/resolution_notification_controller.h', 972 'display/resolution_notification_controller.h',
970 'system/tray/media_security/media_capture_observer.h', 973 'system/tray/media_security/media_capture_observer.h',
971 'system/tray/media_security/multi_profile_media_tray_item.cc', 974 'system/tray/media_security/multi_profile_media_tray_item.cc',
972 'system/tray/media_security/multi_profile_media_tray_item.h', 975 'system/tray/media_security/multi_profile_media_tray_item.h',
973 'touch/touch_transformer_controller.cc', 976 'touch/touch_transformer_controller.cc',
974 'touch/touch_transformer_controller.h', 977 'touch/touch_transformer_controller.h',
978 'touch/touchscreen_util.cc',
979 'touch/touchscreen_util.h',
975 ], 980 ],
976 }], 981 }],
977 ], 982 ],
978 }, 983 },
979 { 984 {
980 # GN version: //ash:ash_with_content 985 # GN version: //ash:ash_with_content
981 'target_name': 'ash_with_content', 986 'target_name': 'ash_with_content',
982 'type': '<(component)', 987 'type': '<(component)',
983 'dependencies': [ 988 'dependencies': [
984 '../base/base.gyp:base', 989 '../base/base.gyp:base',
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 '../ui/display/display.gyp:display_test_util', 1148 '../ui/display/display.gyp:display_test_util',
1144 '../ui/display/display.gyp:display_types', 1149 '../ui/display/display.gyp:display_types',
1145 ], 1150 ],
1146 'sources': [ 1151 'sources': [
1147 'first_run/first_run_helper_unittest.cc', 1152 'first_run/first_run_helper_unittest.cc',
1148 ], 1153 ],
1149 }, { # else: chromeos!=1 1154 }, { # else: chromeos!=1
1150 'sources!': [ 1155 'sources!': [
1151 'display/resolution_notification_controller_unittest.cc', 1156 'display/resolution_notification_controller_unittest.cc',
1152 'touch/touch_transformer_controller_unittest.cc', 1157 'touch/touch_transformer_controller_unittest.cc',
1158 'touch/touchscreen_util_unittest.cc',
1153 ], 1159 ],
1154 }], 1160 }],
1155 ['OS=="linux" and component=="shared_library" and use_allocator!="none"' , { 1161 ['OS=="linux" and component=="shared_library" and use_allocator!="none"' , {
1156 'dependencies': [ 1162 'dependencies': [
1157 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1163 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1158 ], 1164 ],
1159 'link_settings': { 1165 'link_settings': {
1160 'ldflags': ['-rdynamic'], 1166 'ldflags': ['-rdynamic'],
1161 }, 1167 },
1162 }], 1168 }],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 'conditions': [ 1268 'conditions': [
1263 ['chromeos==1', { 1269 ['chromeos==1', {
1264 'dependencies': [ 1270 'dependencies': [
1265 '../ui/display/display.gyp:display', 1271 '../ui/display/display.gyp:display',
1266 ], 1272 ],
1267 }], 1273 }],
1268 ], 1274 ],
1269 }, 1275 },
1270 ], 1276 ],
1271 } 1277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698