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

Side by Side Diff: ash/ash.gyp

Issue 118543002: Move sticky keys files to their own directory and rename to StickyKeysController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update ash.gyp Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/shell.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 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 'shelf/shelf_widget.h', 234 'shelf/shelf_widget.h',
235 'shelf/shelf_window_watcher.cc', 235 'shelf/shelf_window_watcher.cc',
236 'shelf/shelf_window_watcher.h', 236 'shelf/shelf_window_watcher.h',
237 'shelf/shelf_window_watcher_item_delegate.cc', 237 'shelf/shelf_window_watcher_item_delegate.cc',
238 'shelf/shelf_window_watcher_item_delegate.h', 238 'shelf/shelf_window_watcher_item_delegate.h',
239 'shell.cc', 239 'shell.cc',
240 'shell.h', 240 'shell.h',
241 'shell_delegate.h', 241 'shell_delegate.h',
242 'shell_factory.h', 242 'shell_factory.h',
243 'shell_window_ids.h', 243 'shell_window_ids.h',
244 'sticky_keys/sticky_keys_controller.cc',
245 'sticky_keys/sticky_keys_controller.h',
244 'system/bluetooth/bluetooth_observer.h', 246 'system/bluetooth/bluetooth_observer.h',
245 'system/bluetooth/tray_bluetooth.cc', 247 'system/bluetooth/tray_bluetooth.cc',
246 'system/bluetooth/tray_bluetooth.h', 248 'system/bluetooth/tray_bluetooth.h',
247 'system/brightness_control_delegate.h', 249 'system/brightness_control_delegate.h',
248 'system/chromeos/audio/tray_audio.cc', 250 'system/chromeos/audio/tray_audio.cc',
249 'system/chromeos/audio/tray_audio.h', 251 'system/chromeos/audio/tray_audio.h',
250 'system/chromeos/enterprise/enterprise_domain_observer.h', 252 'system/chromeos/enterprise/enterprise_domain_observer.h',
251 'system/chromeos/brightness/brightness_controller_chromeos.cc', 253 'system/chromeos/brightness/brightness_controller_chromeos.cc',
252 'system/chromeos/brightness/brightness_controller_chromeos.h', 254 'system/chromeos/brightness/brightness_controller_chromeos.h',
253 'system/chromeos/brightness/tray_brightness.cc', 255 'system/chromeos/brightness/tray_brightness.cc',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 'wm/screen_dimmer.cc', 535 'wm/screen_dimmer.cc',
534 'wm/screen_dimmer.h', 536 'wm/screen_dimmer.h',
535 'wm/session_state_animator.cc', 537 'wm/session_state_animator.cc',
536 'wm/session_state_animator.h', 538 'wm/session_state_animator.h',
537 'wm/solo_window_tracker.cc', 539 'wm/solo_window_tracker.cc',
538 'wm/solo_window_tracker.h', 540 'wm/solo_window_tracker.h',
539 'wm/stacking_controller.cc', 541 'wm/stacking_controller.cc',
540 'wm/stacking_controller.h', 542 'wm/stacking_controller.h',
541 'wm/status_area_layout_manager.cc', 543 'wm/status_area_layout_manager.cc',
542 'wm/status_area_layout_manager.h', 544 'wm/status_area_layout_manager.h',
543 'wm/sticky_keys.cc',
544 'wm/sticky_keys.h',
545 'wm/system_background_controller.cc', 545 'wm/system_background_controller.cc',
546 'wm/system_background_controller.h', 546 'wm/system_background_controller.h',
547 'wm/system_gesture_event_filter.cc', 547 'wm/system_gesture_event_filter.cc',
548 'wm/system_gesture_event_filter.h', 548 'wm/system_gesture_event_filter.h',
549 'wm/system_modal_container_event_filter.cc', 549 'wm/system_modal_container_event_filter.cc',
550 'wm/system_modal_container_event_filter.h', 550 'wm/system_modal_container_event_filter.h',
551 'wm/system_modal_container_event_filter_delegate.h', 551 'wm/system_modal_container_event_filter_delegate.h',
552 'wm/system_modal_container_layout_manager.cc', 552 'wm/system_modal_container_layout_manager.cc',
553 'wm/system_modal_container_layout_manager.h', 553 'wm/system_modal_container_layout_manager.h',
554 'wm/toplevel_window_event_handler.cc', 554 'wm/toplevel_window_event_handler.cc',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 'wm/workspace/workspace_layout_manager.cc', 595 'wm/workspace/workspace_layout_manager.cc',
596 'wm/workspace/workspace_layout_manager.h', 596 'wm/workspace/workspace_layout_manager.h',
597 'wm/workspace/workspace_types.h', 597 'wm/workspace/workspace_types.h',
598 'wm/workspace/workspace_window_resizer.cc', 598 'wm/workspace/workspace_window_resizer.cc',
599 'wm/workspace/workspace_window_resizer.h', 599 'wm/workspace/workspace_window_resizer.h',
600 ], 600 ],
601 'conditions': [ 601 'conditions': [
602 ['OS=="win"', { 602 ['OS=="win"', {
603 'sources/': [ 603 'sources/': [
604 ['exclude', 'host/root_window_host_factory.cc'], 604 ['exclude', 'host/root_window_host_factory.cc'],
605 ['exclude', 'wm/sticky_keys.cc'], 605 ['exclude', 'sticky_keys/sticky_keys_controller.cc'],
606 ['exclude', 'wm/sticky_keys.h'], 606 ['exclude', 'sticky_keys/sticky_keys_controller.h'],
607 ], 607 ],
608 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 608 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
609 'msvs_disabled_warnings': [ 4267, ], 609 'msvs_disabled_warnings': [ 4267, ],
610 }], 610 }],
611 ['OS!="linux"', { 611 ['OS!="linux"', {
612 'sources/': [ 612 'sources/': [
613 ['exclude', 'system/monitor/tray_monitor.cc'], 613 ['exclude', 'system/monitor/tray_monitor.cc'],
614 ['exclude', 'system/monitor/tray_monitor.h'], 614 ['exclude', 'system/monitor/tray_monitor.h'],
615 ], 615 ],
616 }], 616 }],
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 'shell/shell_delegate_impl.h', 809 'shell/shell_delegate_impl.h',
810 'shell/widgets.cc', 810 'shell/widgets.cc',
811 'shell/window_type_launcher.cc', 811 'shell/window_type_launcher.cc',
812 'shell/window_type_launcher.h', 812 'shell/window_type_launcher.h',
813 'shell/window_watcher.cc', 813 'shell/window_watcher.cc',
814 'shell/window_watcher.h', 814 'shell/window_watcher.h',
815 'shell/window_watcher_shelf_item_delegate.cc', 815 'shell/window_watcher_shelf_item_delegate.cc',
816 'shell/window_watcher_shelf_item_delegate.h', 816 'shell/window_watcher_shelf_item_delegate.h',
817 'shell/window_watcher_unittest.cc', 817 'shell/window_watcher_unittest.cc',
818 'shell_unittest.cc', 818 'shell_unittest.cc',
819 'sticky_keys/sticky_keys_unittest.cc',
819 'system/chromeos/managed/tray_locally_managed_user_unittest.cc', 820 'system/chromeos/managed/tray_locally_managed_user_unittest.cc',
820 'system/chromeos/network/network_state_notifier_unittest.cc', 821 'system/chromeos/network/network_state_notifier_unittest.cc',
821 'system/chromeos/power/power_event_observer_unittest.cc', 822 'system/chromeos/power/power_event_observer_unittest.cc',
822 'system/chromeos/power/power_status_unittest.cc', 823 'system/chromeos/power/power_status_unittest.cc',
823 'system/chromeos/power/tray_power_unittest.cc', 824 'system/chromeos/power/tray_power_unittest.cc',
824 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 825 'system/chromeos/screen_security/screen_tray_item_unittest.cc',
825 'system/chromeos/tray_display_unittest.cc', 826 'system/chromeos/tray_display_unittest.cc',
826 'system/date/date_view_unittest.cc', 827 'system/date/date_view_unittest.cc',
827 'system/session_length_limit/tray_session_length_limit_unittest.cc', 828 'system/session_length_limit/tray_session_length_limit_unittest.cc',
828 'system/tray/system_tray_unittest.cc', 829 'system/tray/system_tray_unittest.cc',
(...skipping 19 matching lines...) Expand all
848 'wm/lock_state_controller_unittest.cc', 849 'wm/lock_state_controller_unittest.cc',
849 'wm/mru_window_tracker_unittest.cc', 850 'wm/mru_window_tracker_unittest.cc',
850 'wm/overview/window_selector_unittest.cc', 851 'wm/overview/window_selector_unittest.cc',
851 'wm/panels/panel_layout_manager_unittest.cc', 852 'wm/panels/panel_layout_manager_unittest.cc',
852 'wm/panels/panel_window_resizer_unittest.cc', 853 'wm/panels/panel_window_resizer_unittest.cc',
853 'wm/partial_screenshot_view_unittest.cc', 854 'wm/partial_screenshot_view_unittest.cc',
854 'wm/resize_shadow_and_cursor_unittest.cc', 855 'wm/resize_shadow_and_cursor_unittest.cc',
855 'wm/screen_dimmer_unittest.cc', 856 'wm/screen_dimmer_unittest.cc',
856 'wm/solo_window_tracker_unittest.cc', 857 'wm/solo_window_tracker_unittest.cc',
857 'wm/stacking_controller_unittest.cc', 858 'wm/stacking_controller_unittest.cc',
858 'wm/sticky_keys_unittest.cc',
859 'wm/system_gesture_event_filter_unittest.cc', 859 'wm/system_gesture_event_filter_unittest.cc',
860 'wm/system_modal_container_layout_manager_unittest.cc', 860 'wm/system_modal_container_layout_manager_unittest.cc',
861 'wm/toplevel_window_event_handler_unittest.cc', 861 'wm/toplevel_window_event_handler_unittest.cc',
862 'wm/user_activity_detector_unittest.cc', 862 'wm/user_activity_detector_unittest.cc',
863 'wm/video_detector_unittest.cc', 863 'wm/video_detector_unittest.cc',
864 'wm/window_animations_unittest.cc', 864 'wm/window_animations_unittest.cc',
865 'wm/window_cycle_controller_unittest.cc', 865 'wm/window_cycle_controller_unittest.cc',
866 'wm/window_manager_unittest.cc', 866 'wm/window_manager_unittest.cc',
867 'wm/window_modality_controller_unittest.cc', 867 'wm/window_modality_controller_unittest.cc',
868 'wm/window_positioner_unittest.cc', 868 'wm/window_positioner_unittest.cc',
(...skipping 15 matching lines...) Expand all
884 'sources/': [ 884 'sources/': [
885 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 885 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
886 ['exclude', 'focus_cycler_unittest.cc'], 886 ['exclude', 'focus_cycler_unittest.cc'],
887 # All tests for multiple displays: not supported on Windows Ash. 887 # All tests for multiple displays: not supported on Windows Ash.
888 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] , 888 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] ,
889 ['exclude', 'wm/drag_window_resizer_unittest.cc'], 889 ['exclude', 'wm/drag_window_resizer_unittest.cc'],
890 # Can't resize on Windows Ash. http://crbug.com/165962 890 # Can't resize on Windows Ash. http://crbug.com/165962
891 ['exclude', 'ash_root_window_transformer_unittest.cc'], 891 ['exclude', 'ash_root_window_transformer_unittest.cc'],
892 ['exclude', 'magnifier/magnification_controller_unittest.cc'], 892 ['exclude', 'magnifier/magnification_controller_unittest.cc'],
893 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'], 893 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'],
894 ['exclude', 'wm/sticky_keys_unittest.cc'], 894 ['exclude', 'sticky_keys/sticky_keys_unittest.cc'],
895 ['exclude', 'autoclick/autoclick_unittest.cc'], 895 ['exclude', 'autoclick/autoclick_unittest.cc'],
896 ], 896 ],
897 'sources': [ 897 'sources': [
898 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 898 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
899 ], 899 ],
900 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 900 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
901 'msvs_disabled_warnings': [ 4267, ], 901 'msvs_disabled_warnings': [ 4267, ],
902 }], 902 }],
903 ['OS=="win" and win_use_allocator_shim==1', { 903 ['OS=="win" and win_use_allocator_shim==1', {
904 'dependencies': [ 904 'dependencies': [
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 }, 1004 },
1005 }, 1005 },
1006 'dependencies': [ 1006 'dependencies': [
1007 '../sandbox/sandbox.gyp:sandbox', 1007 '../sandbox/sandbox.gyp:sandbox',
1008 ], 1008 ],
1009 }], 1009 }],
1010 ], 1010 ],
1011 }, 1011 },
1012 ], 1012 ],
1013 } 1013 }
OLDNEW
« no previous file with comments | « no previous file | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698