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

Side by Side Diff: ash/ash.gyp

Issue 2108403004: mash: Move several chromeos system tray items to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio
Patch Set: Rebase Created 4 years, 5 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/common/system/chromeos/bluetooth/bluetooth_notification_controller.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 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 'common/system/audio/volume_view.cc', 110 'common/system/audio/volume_view.cc',
111 'common/system/audio/volume_view.h', 111 'common/system/audio/volume_view.h',
112 'common/system/cast/tray_cast.cc', 112 'common/system/cast/tray_cast.cc',
113 'common/system/cast/tray_cast.h', 113 'common/system/cast/tray_cast.h',
114 'common/system/chromeos/audio/audio_detailed_view.cc', 114 'common/system/chromeos/audio/audio_detailed_view.cc',
115 'common/system/chromeos/audio/audio_detailed_view.h', 115 'common/system/chromeos/audio/audio_detailed_view.h',
116 'common/system/chromeos/audio/tray_audio_chromeos.cc', 116 'common/system/chromeos/audio/tray_audio_chromeos.cc',
117 'common/system/chromeos/audio/tray_audio_chromeos.h', 117 'common/system/chromeos/audio/tray_audio_chromeos.h',
118 'common/system/chromeos/audio/tray_audio_delegate_chromeos.cc', 118 'common/system/chromeos/audio/tray_audio_delegate_chromeos.cc',
119 'common/system/chromeos/audio/tray_audio_delegate_chromeos.h', 119 'common/system/chromeos/audio/tray_audio_delegate_chromeos.h',
120 'common/system/chromeos/bluetooth/bluetooth_notification_controller.cc',
121 'common/system/chromeos/bluetooth/bluetooth_notification_controller.h',
120 'common/system/chromeos/bluetooth/bluetooth_observer.h', 122 'common/system/chromeos/bluetooth/bluetooth_observer.h',
123 'common/system/chromeos/bluetooth/tray_bluetooth.cc',
124 'common/system/chromeos/bluetooth/tray_bluetooth.h',
121 'common/system/chromeos/devicetype_utils.cc', 125 'common/system/chromeos/devicetype_utils.cc',
122 'common/system/chromeos/devicetype_utils.h', 126 'common/system/chromeos/devicetype_utils.h',
123 'common/system/chromeos/enterprise/enterprise_domain_observer.h', 127 'common/system/chromeos/enterprise/enterprise_domain_observer.h',
128 'common/system/chromeos/enterprise/tray_enterprise.cc',
129 'common/system/chromeos/enterprise/tray_enterprise.h',
124 'common/system/chromeos/media_security/media_capture_observer.h', 130 'common/system/chromeos/media_security/media_capture_observer.h',
125 'common/system/chromeos/network/network_detailed_view.h', 131 'common/system/chromeos/network/network_detailed_view.h',
126 'common/system/chromeos/network/network_observer.h', 132 'common/system/chromeos/network/network_observer.h',
127 'common/system/chromeos/network/network_portal_detector_observer.h', 133 'common/system/chromeos/network/network_portal_detector_observer.h',
128 'common/system/chromeos/network/network_state_list_detailed_view.cc', 134 'common/system/chromeos/network/network_state_list_detailed_view.cc',
129 'common/system/chromeos/network/network_state_list_detailed_view.h', 135 'common/system/chromeos/network/network_state_list_detailed_view.h',
130 'common/system/chromeos/network/tray_network.cc', 136 'common/system/chromeos/network/tray_network.cc',
131 'common/system/chromeos/network/tray_network.h', 137 'common/system/chromeos/network/tray_network.h',
132 'common/system/chromeos/network/tray_network_state_observer.cc', 138 'common/system/chromeos/network/tray_network_state_observer.cc',
133 'common/system/chromeos/network/tray_network_state_observer.h', 139 'common/system/chromeos/network/tray_network_state_observer.h',
(...skipping 30 matching lines...) Expand all
164 'common/system/chromeos/session/logout_confirmation_controller.cc', 170 'common/system/chromeos/session/logout_confirmation_controller.cc',
165 'common/system/chromeos/session/logout_confirmation_controller.h', 171 'common/system/chromeos/session/logout_confirmation_controller.h',
166 'common/system/chromeos/session/logout_confirmation_dialog.cc', 172 'common/system/chromeos/session/logout_confirmation_dialog.cc',
167 'common/system/chromeos/session/logout_confirmation_dialog.h', 173 'common/system/chromeos/session/logout_confirmation_dialog.h',
168 'common/system/chromeos/session/session_length_limit_observer.h', 174 'common/system/chromeos/session/session_length_limit_observer.h',
169 'common/system/chromeos/session/tray_session_length_limit.cc', 175 'common/system/chromeos/session/tray_session_length_limit.cc',
170 'common/system/chromeos/session/tray_session_length_limit.h', 176 'common/system/chromeos/session/tray_session_length_limit.h',
171 'common/system/chromeos/settings/tray_settings.cc', 177 'common/system/chromeos/settings/tray_settings.cc',
172 'common/system/chromeos/settings/tray_settings.h', 178 'common/system/chromeos/settings/tray_settings.h',
173 'common/system/chromeos/shutdown_policy_observer.h', 179 'common/system/chromeos/shutdown_policy_observer.h',
180 'common/system/chromeos/supervised/custodian_info_tray_observer.h',
181 'common/system/chromeos/supervised/tray_supervised_user.cc',
182 'common/system/chromeos/supervised/tray_supervised_user.h',
174 'common/system/chromeos/system_clock_observer.cc', 183 'common/system/chromeos/system_clock_observer.cc',
175 'common/system/chromeos/system_clock_observer.h', 184 'common/system/chromeos/system_clock_observer.h',
185 'common/system/chromeos/tray_caps_lock.cc',
186 'common/system/chromeos/tray_caps_lock.h',
176 'common/system/chromeos/tray_tracing.cc', 187 'common/system/chromeos/tray_tracing.cc',
177 'common/system/chromeos/tray_tracing.h', 188 'common/system/chromeos/tray_tracing.h',
178 'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h', 189 'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
179 'common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc', 190 'common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
180 'common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h', 191 'common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
181 'common/system/date/clock_observer.h', 192 'common/system/date/clock_observer.h',
182 'common/system/date/date_default_view.cc', 193 'common/system/date/date_default_view.cc',
183 'common/system/date/date_default_view.h', 194 'common/system/date/date_default_view.h',
184 'common/system/date/date_view.cc', 195 'common/system/date/date_view.cc',
185 'common/system/date/date_view.h', 196 'common/system/date/date_view.h',
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 'shell_init_params.cc', 595 'shell_init_params.cc',
585 'shell_init_params.h', 596 'shell_init_params.h',
586 'snap_to_pixel_layout_manager.cc', 597 'snap_to_pixel_layout_manager.cc',
587 'snap_to_pixel_layout_manager.h', 598 'snap_to_pixel_layout_manager.h',
588 'sticky_keys/sticky_keys_controller.cc', 599 'sticky_keys/sticky_keys_controller.cc',
589 'sticky_keys/sticky_keys_controller.h', 600 'sticky_keys/sticky_keys_controller.h',
590 'sticky_keys/sticky_keys_overlay.cc', 601 'sticky_keys/sticky_keys_overlay.cc',
591 'sticky_keys/sticky_keys_overlay.h', 602 'sticky_keys/sticky_keys_overlay.h',
592 'sticky_keys/sticky_keys_state.h', 603 'sticky_keys/sticky_keys_state.h',
593 'system/brightness_control_delegate.h', 604 'system/brightness_control_delegate.h',
594 'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
595 'system/chromeos/bluetooth/bluetooth_notification_controller.h',
596 'system/chromeos/bluetooth/tray_bluetooth.cc',
597 'system/chromeos/bluetooth/tray_bluetooth.h',
598 'system/chromeos/brightness/brightness_controller_chromeos.cc', 605 'system/chromeos/brightness/brightness_controller_chromeos.cc',
599 'system/chromeos/brightness/brightness_controller_chromeos.h', 606 'system/chromeos/brightness/brightness_controller_chromeos.h',
600 'system/chromeos/brightness/tray_brightness.cc', 607 'system/chromeos/brightness/tray_brightness.cc',
601 'system/chromeos/brightness/tray_brightness.h', 608 'system/chromeos/brightness/tray_brightness.h',
602 'system/chromeos/enterprise/tray_enterprise.cc',
603 'system/chromeos/enterprise/tray_enterprise.h',
604 'system/chromeos/keyboard_brightness_controller.cc', 609 'system/chromeos/keyboard_brightness_controller.cc',
605 'system/chromeos/keyboard_brightness_controller.h', 610 'system/chromeos/keyboard_brightness_controller.h',
606 'system/chromeos/media_security/multi_profile_media_tray_item.cc', 611 'system/chromeos/media_security/multi_profile_media_tray_item.cc',
607 'system/chromeos/media_security/multi_profile_media_tray_item.h', 612 'system/chromeos/media_security/multi_profile_media_tray_item.h',
608 'system/chromeos/multi_user/user_switch_util.cc', 613 'system/chromeos/multi_user/user_switch_util.cc',
609 'system/chromeos/multi_user/user_switch_util.h', 614 'system/chromeos/multi_user/user_switch_util.h',
610 'system/chromeos/power/power_event_observer.cc', 615 'system/chromeos/power/power_event_observer.cc',
611 'system/chromeos/power/power_event_observer.h', 616 'system/chromeos/power/power_event_observer.h',
612 'system/chromeos/power/video_activity_notifier.cc', 617 'system/chromeos/power/video_activity_notifier.cc',
613 'system/chromeos/power/video_activity_notifier.h', 618 'system/chromeos/power/video_activity_notifier.h',
614 'system/chromeos/rotation/tray_rotation_lock.cc', 619 'system/chromeos/rotation/tray_rotation_lock.cc',
615 'system/chromeos/rotation/tray_rotation_lock.h', 620 'system/chromeos/rotation/tray_rotation_lock.h',
616 'system/chromeos/supervised/custodian_info_tray_observer.h',
617 'system/chromeos/supervised/tray_supervised_user.cc',
618 'system/chromeos/supervised/tray_supervised_user.h',
619 'system/chromeos/tray_caps_lock.cc',
620 'system/chromeos/tray_caps_lock.h',
621 'system/chromeos/tray_display.cc', 621 'system/chromeos/tray_display.cc',
622 'system/chromeos/tray_display.h', 622 'system/chromeos/tray_display.h',
623 'system/keyboard_brightness/keyboard_brightness_control_delegate.h', 623 'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
624 'system/overview/overview_button_tray.cc', 624 'system/overview/overview_button_tray.cc',
625 'system/overview/overview_button_tray.h', 625 'system/overview/overview_button_tray.h',
626 'system/status_area_widget.cc', 626 'system/status_area_widget.cc',
627 'system/status_area_widget.h', 627 'system/status_area_widget.h',
628 'system/toast/toast_data.cc', 628 'system/toast/toast_data.cc',
629 'system/toast/toast_data.h', 629 'system/toast/toast_data.h',
630 'system/toast/toast_manager.cc', 630 'system/toast/toast_manager.cc',
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 'autoclick/autoclick_unittest.cc', 897 'autoclick/autoclick_unittest.cc',
898 'common/display/display_info_unittest.cc', 898 'common/display/display_info_unittest.cc',
899 'common/material_design/material_design_controller_unittest.cc', 899 'common/material_design/material_design_controller_unittest.cc',
900 'common/shelf/shelf_model_unittest.cc', 900 'common/shelf/shelf_model_unittest.cc',
901 'common/system/chromeos/power/power_status_unittest.cc', 901 'common/system/chromeos/power/power_status_unittest.cc',
902 'common/system/chromeos/power/power_status_view_unittest.cc', 902 'common/system/chromeos/power/power_status_view_unittest.cc',
903 'common/system/chromeos/power/tray_power_unittest.cc', 903 'common/system/chromeos/power/tray_power_unittest.cc',
904 'common/system/chromeos/screen_security/screen_tray_item_unittest.cc', 904 'common/system/chromeos/screen_security/screen_tray_item_unittest.cc',
905 'common/system/chromeos/session/logout_confirmation_controller_unittest.cc ', 905 'common/system/chromeos/session/logout_confirmation_controller_unittest.cc ',
906 'common/system/chromeos/session/tray_session_length_limit_unittest.cc', 906 'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
907 'common/system/chromeos/supervised/tray_supervised_user_unittest.cc',
907 'common/system/date/date_view_unittest.cc', 908 'common/system/date/date_view_unittest.cc',
908 'common/system/ime/tray_ime_chromeos_unittest.cc', 909 'common/system/ime/tray_ime_chromeos_unittest.cc',
909 'common/system/tray/tray_details_view_unittest.cc', 910 'common/system/tray/tray_details_view_unittest.cc',
910 'common/system/update/tray_update_unittest.cc', 911 'common/system/update/tray_update_unittest.cc',
911 'content/display/screen_orientation_controller_chromeos_unittest.cc', 912 'content/display/screen_orientation_controller_chromeos_unittest.cc',
912 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 913 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
913 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc', 914 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
914 'desktop_background/desktop_background_controller_unittest.cc', 915 'desktop_background/desktop_background_controller_unittest.cc',
915 'dip_unittest.cc', 916 'dip_unittest.cc',
916 'display/cursor_window_controller_unittest.cc', 917 'display/cursor_window_controller_unittest.cc',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 'shelf/shelf_widget_unittest.cc', 960 'shelf/shelf_widget_unittest.cc',
960 'shelf/shelf_window_watcher_unittest.cc', 961 'shelf/shelf_window_watcher_unittest.cc',
961 'shell_unittest.cc', 962 'shell_unittest.cc',
962 'sticky_keys/sticky_keys_overlay_unittest.cc', 963 'sticky_keys/sticky_keys_overlay_unittest.cc',
963 'sticky_keys/sticky_keys_unittest.cc', 964 'sticky_keys/sticky_keys_unittest.cc',
964 'system/chromeos/brightness/tray_brightness_unittest.cc', 965 'system/chromeos/brightness/tray_brightness_unittest.cc',
965 'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc' , 966 'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc' ,
966 'system/chromeos/multi_user/user_switch_util_unittest.cc', 967 'system/chromeos/multi_user/user_switch_util_unittest.cc',
967 'system/chromeos/power/power_event_observer_unittest.cc', 968 'system/chromeos/power/power_event_observer_unittest.cc',
968 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', 969 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
969 'system/chromeos/supervised/tray_supervised_user_unittest.cc',
970 'system/chromeos/tray_display_unittest.cc', 970 'system/chromeos/tray_display_unittest.cc',
971 'system/overview/overview_button_tray_unittest.cc', 971 'system/overview/overview_button_tray_unittest.cc',
972 'system/toast/toast_manager_unittest.cc', 972 'system/toast/toast_manager_unittest.cc',
973 'system/tray/system_tray_unittest.cc', 973 'system/tray/system_tray_unittest.cc',
974 'system/user/tray_user_unittest.cc', 974 'system/user/tray_user_unittest.cc',
975 'system/web_notification/ash_popup_alignment_delegate_unittest.cc', 975 'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
976 'system/web_notification/web_notification_tray_unittest.cc', 976 'system/web_notification/web_notification_tray_unittest.cc',
977 'test/ash_test_helper_unittest.cc', 977 'test/ash_test_helper_unittest.cc',
978 'test/ash_unittests.cc', 978 'test/ash_unittests.cc',
979 'tooltips/tooltip_controller_unittest.cc', 979 'tooltips/tooltip_controller_unittest.cc',
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1450 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1451 ], 1451 ],
1452 } 1452 }
1453 ], 1453 ],
1454 ], 1454 ],
1455 }, 1455 },
1456 ], 1456 ],
1457 }], 1457 }],
1458 ], 1458 ],
1459 } 1459 }
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698