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

Side by Side Diff: ash/ash.gyp

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests 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/session/last_window_closed_observer.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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'common/system/chromeos/power/power_status.cc', 123 'common/system/chromeos/power/power_status.cc',
124 'common/system/chromeos/power/power_status.h', 124 'common/system/chromeos/power/power_status.h',
125 'common/system/chromeos/power/power_status_view.cc', 125 'common/system/chromeos/power/power_status_view.cc',
126 'common/system/chromeos/power/power_status_view.h', 126 'common/system/chromeos/power/power_status_view.h',
127 'common/system/chromeos/power/tray_power.cc', 127 'common/system/chromeos/power/tray_power.cc',
128 'common/system/chromeos/power/tray_power.h', 128 'common/system/chromeos/power/tray_power.h',
129 'common/system/chromeos/screen_security/screen_capture_observer.h', 129 'common/system/chromeos/screen_security/screen_capture_observer.h',
130 'common/system/chromeos/screen_security/screen_share_observer.h', 130 'common/system/chromeos/screen_security/screen_share_observer.h',
131 'common/system/chromeos/session/last_window_closed_observer.h', 131 'common/system/chromeos/session/last_window_closed_observer.h',
132 'common/system/chromeos/session/logout_button_observer.h', 132 'common/system/chromeos/session/logout_button_observer.h',
133 'common/system/chromeos/session/logout_button_tray.cc',
134 'common/system/chromeos/session/logout_button_tray.h',
135 'common/system/chromeos/session/logout_confirmation_controller.cc',
136 'common/system/chromeos/session/logout_confirmation_controller.h',
137 'common/system/chromeos/session/logout_confirmation_dialog.cc',
138 'common/system/chromeos/session/logout_confirmation_dialog.h',
133 'common/system/chromeos/session/session_length_limit_observer.h', 139 'common/system/chromeos/session/session_length_limit_observer.h',
140 'common/system/chromeos/session/tray_session_length_limit.cc',
141 'common/system/chromeos/session/tray_session_length_limit.h',
134 'common/system/chromeos/settings/tray_settings.cc', 142 'common/system/chromeos/settings/tray_settings.cc',
135 'common/system/chromeos/settings/tray_settings.h', 143 'common/system/chromeos/settings/tray_settings.h',
136 'common/system/chromeos/shutdown_policy_observer.h', 144 'common/system/chromeos/shutdown_policy_observer.h',
137 'common/system/chromeos/system_clock_observer.cc', 145 'common/system/chromeos/system_clock_observer.cc',
138 'common/system/chromeos/system_clock_observer.h', 146 'common/system/chromeos/system_clock_observer.h',
139 'common/system/chromeos/tray_tracing.cc', 147 'common/system/chromeos/tray_tracing.cc',
140 'common/system/chromeos/tray_tracing.h', 148 'common/system/chromeos/tray_tracing.h',
141 'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h', 149 'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
142 'common/system/date/clock_observer.h', 150 'common/system/date/clock_observer.h',
143 'common/system/date/date_default_view.cc', 151 'common/system/date/date_default_view.cc',
(...skipping 15 matching lines...) Expand all
159 'common/system/tray/actionable_view.cc', 167 'common/system/tray/actionable_view.cc',
160 'common/system/tray/actionable_view.h', 168 'common/system/tray/actionable_view.h',
161 'common/system/tray/default_system_tray_delegate.cc', 169 'common/system/tray/default_system_tray_delegate.cc',
162 'common/system/tray/default_system_tray_delegate.h', 170 'common/system/tray/default_system_tray_delegate.h',
163 'common/system/tray/fixed_sized_image_view.cc', 171 'common/system/tray/fixed_sized_image_view.cc',
164 'common/system/tray/fixed_sized_image_view.h', 172 'common/system/tray/fixed_sized_image_view.h',
165 'common/system/tray/fixed_sized_scroll_view.cc', 173 'common/system/tray/fixed_sized_scroll_view.cc',
166 'common/system/tray/fixed_sized_scroll_view.h', 174 'common/system/tray/fixed_sized_scroll_view.h',
167 'common/system/tray/hover_highlight_view.cc', 175 'common/system/tray/hover_highlight_view.cc',
168 'common/system/tray/hover_highlight_view.h', 176 'common/system/tray/hover_highlight_view.h',
177 'common/system/tray/label_tray_view.cc',
178 'common/system/tray/label_tray_view.h',
169 'common/system/tray/special_popup_row.cc', 179 'common/system/tray/special_popup_row.cc',
170 'common/system/tray/special_popup_row.h', 180 'common/system/tray/special_popup_row.h',
171 'common/system/tray/system_tray_bubble.cc', 181 'common/system/tray/system_tray_bubble.cc',
172 'common/system/tray/system_tray_bubble.h', 182 'common/system/tray/system_tray_bubble.h',
173 'common/system/tray/system_tray_delegate.cc', 183 'common/system/tray/system_tray_delegate.cc',
174 'common/system/tray/system_tray_delegate.h', 184 'common/system/tray/system_tray_delegate.h',
175 'common/system/tray/system_tray_item.cc', 185 'common/system/tray/system_tray_item.cc',
176 'common/system/tray/system_tray_item.h', 186 'common/system/tray/system_tray_item.h',
177 'common/system/tray/system_tray_notifier.cc', 187 'common/system/tray/system_tray_notifier.cc',
178 'common/system/tray/system_tray_notifier.h', 188 'common/system/tray/system_tray_notifier.h',
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 'system/chromeos/bluetooth/tray_bluetooth.cc', 565 'system/chromeos/bluetooth/tray_bluetooth.cc',
556 'system/chromeos/bluetooth/tray_bluetooth.h', 566 'system/chromeos/bluetooth/tray_bluetooth.h',
557 'system/chromeos/brightness/brightness_controller_chromeos.cc', 567 'system/chromeos/brightness/brightness_controller_chromeos.cc',
558 'system/chromeos/brightness/brightness_controller_chromeos.h', 568 'system/chromeos/brightness/brightness_controller_chromeos.h',
559 'system/chromeos/brightness/tray_brightness.cc', 569 'system/chromeos/brightness/tray_brightness.cc',
560 'system/chromeos/brightness/tray_brightness.h', 570 'system/chromeos/brightness/tray_brightness.h',
561 'system/chromeos/enterprise/tray_enterprise.cc', 571 'system/chromeos/enterprise/tray_enterprise.cc',
562 'system/chromeos/enterprise/tray_enterprise.h', 572 'system/chromeos/enterprise/tray_enterprise.h',
563 'system/chromeos/keyboard_brightness_controller.cc', 573 'system/chromeos/keyboard_brightness_controller.cc',
564 'system/chromeos/keyboard_brightness_controller.h', 574 'system/chromeos/keyboard_brightness_controller.h',
565 'system/chromeos/label_tray_view.cc',
566 'system/chromeos/label_tray_view.h',
567 'system/chromeos/media_security/multi_profile_media_tray_item.cc', 575 'system/chromeos/media_security/multi_profile_media_tray_item.cc',
568 'system/chromeos/media_security/multi_profile_media_tray_item.h', 576 'system/chromeos/media_security/multi_profile_media_tray_item.h',
569 'system/chromeos/multi_user/user_switch_util.cc', 577 'system/chromeos/multi_user/user_switch_util.cc',
570 'system/chromeos/multi_user/user_switch_util.h', 578 'system/chromeos/multi_user/user_switch_util.h',
571 'system/chromeos/network/network_detailed_view.h', 579 'system/chromeos/network/network_detailed_view.h',
572 'system/chromeos/network/network_state_list_detailed_view.cc', 580 'system/chromeos/network/network_state_list_detailed_view.cc',
573 'system/chromeos/network/network_state_list_detailed_view.h', 581 'system/chromeos/network/network_state_list_detailed_view.h',
574 'system/chromeos/network/tray_network.cc', 582 'system/chromeos/network/tray_network.cc',
575 'system/chromeos/network/tray_network.h', 583 'system/chromeos/network/tray_network.h',
576 'system/chromeos/network/tray_network_state_observer.cc', 584 'system/chromeos/network/tray_network_state_observer.cc',
(...skipping 11 matching lines...) Expand all
588 'system/chromeos/power/video_activity_notifier.cc', 596 'system/chromeos/power/video_activity_notifier.cc',
589 'system/chromeos/power/video_activity_notifier.h', 597 'system/chromeos/power/video_activity_notifier.h',
590 'system/chromeos/rotation/tray_rotation_lock.cc', 598 'system/chromeos/rotation/tray_rotation_lock.cc',
591 'system/chromeos/rotation/tray_rotation_lock.h', 599 'system/chromeos/rotation/tray_rotation_lock.h',
592 'system/chromeos/screen_security/screen_capture_tray_item.cc', 600 'system/chromeos/screen_security/screen_capture_tray_item.cc',
593 'system/chromeos/screen_security/screen_capture_tray_item.h', 601 'system/chromeos/screen_security/screen_capture_tray_item.h',
594 'system/chromeos/screen_security/screen_share_tray_item.cc', 602 'system/chromeos/screen_security/screen_share_tray_item.cc',
595 'system/chromeos/screen_security/screen_share_tray_item.h', 603 'system/chromeos/screen_security/screen_share_tray_item.h',
596 'system/chromeos/screen_security/screen_tray_item.cc', 604 'system/chromeos/screen_security/screen_tray_item.cc',
597 'system/chromeos/screen_security/screen_tray_item.h', 605 'system/chromeos/screen_security/screen_tray_item.h',
598 'system/chromeos/session/last_window_closed_logout_reminder.cc',
599 'system/chromeos/session/last_window_closed_logout_reminder.h',
600 'system/chromeos/session/logout_button_tray.cc',
601 'system/chromeos/session/logout_button_tray.h',
602 'system/chromeos/session/logout_confirmation_controller.cc',
603 'system/chromeos/session/logout_confirmation_controller.h',
604 'system/chromeos/session/logout_confirmation_dialog.cc',
605 'system/chromeos/session/logout_confirmation_dialog.h',
606 'system/chromeos/session/tray_session_length_limit.cc',
607 'system/chromeos/session/tray_session_length_limit.h',
608 'system/chromeos/supervised/custodian_info_tray_observer.h', 606 'system/chromeos/supervised/custodian_info_tray_observer.h',
609 'system/chromeos/supervised/tray_supervised_user.cc', 607 'system/chromeos/supervised/tray_supervised_user.cc',
610 'system/chromeos/supervised/tray_supervised_user.h', 608 'system/chromeos/supervised/tray_supervised_user.h',
611 'system/chromeos/tray_caps_lock.cc', 609 'system/chromeos/tray_caps_lock.cc',
612 'system/chromeos/tray_caps_lock.h', 610 'system/chromeos/tray_caps_lock.h',
613 'system/chromeos/tray_display.cc', 611 'system/chromeos/tray_display.cc',
614 'system/chromeos/tray_display.h', 612 'system/chromeos/tray_display.h',
615 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc', 613 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
616 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h', 614 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
617 'system/keyboard_brightness/keyboard_brightness_control_delegate.h', 615 'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 'accelerators/spoken_feedback_toggler_unittest.cc', 892 'accelerators/spoken_feedback_toggler_unittest.cc',
895 'app_list/app_list_presenter_delegate_unittest.cc', 893 'app_list/app_list_presenter_delegate_unittest.cc',
896 'ash_touch_exploration_manager_chromeos_unittest.cc', 894 'ash_touch_exploration_manager_chromeos_unittest.cc',
897 'autoclick/autoclick_unittest.cc', 895 'autoclick/autoclick_unittest.cc',
898 'common/display/display_info_unittest.cc', 896 'common/display/display_info_unittest.cc',
899 'common/material_design/material_design_controller_unittest.cc', 897 'common/material_design/material_design_controller_unittest.cc',
900 'common/shelf/shelf_model_unittest.cc', 898 'common/shelf/shelf_model_unittest.cc',
901 'common/system/chromeos/power/power_status_unittest.cc', 899 'common/system/chromeos/power/power_status_unittest.cc',
902 'common/system/chromeos/power/power_status_view_unittest.cc', 900 'common/system/chromeos/power/power_status_view_unittest.cc',
903 'common/system/chromeos/power/tray_power_unittest.cc', 901 'common/system/chromeos/power/tray_power_unittest.cc',
902 'common/system/chromeos/session/logout_confirmation_controller_unittest.cc ',
903 'common/system/chromeos/session/tray_session_length_limit_unittest.cc',
904 'common/system/date/date_view_unittest.cc', 904 'common/system/date/date_view_unittest.cc',
905 'common/system/ime/tray_ime_chromeos_unittest.cc', 905 'common/system/ime/tray_ime_chromeos_unittest.cc',
906 'common/system/tray/tray_details_view_unittest.cc', 906 'common/system/tray/tray_details_view_unittest.cc',
907 'common/system/update/tray_update_unittest.cc', 907 'common/system/update/tray_update_unittest.cc',
908 'content/display/screen_orientation_controller_chromeos_unittest.cc', 908 'content/display/screen_orientation_controller_chromeos_unittest.cc',
909 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 909 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
910 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc', 910 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
911 'desktop_background/desktop_background_controller_unittest.cc', 911 'desktop_background/desktop_background_controller_unittest.cc',
912 'dip_unittest.cc', 912 'dip_unittest.cc',
913 'display/cursor_window_controller_unittest.cc', 913 'display/cursor_window_controller_unittest.cc',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 'shelf/shelf_window_watcher_unittest.cc', 957 'shelf/shelf_window_watcher_unittest.cc',
958 'shell_unittest.cc', 958 'shell_unittest.cc',
959 'sticky_keys/sticky_keys_overlay_unittest.cc', 959 'sticky_keys/sticky_keys_overlay_unittest.cc',
960 'sticky_keys/sticky_keys_unittest.cc', 960 'sticky_keys/sticky_keys_unittest.cc',
961 'system/chromeos/brightness/tray_brightness_unittest.cc', 961 'system/chromeos/brightness/tray_brightness_unittest.cc',
962 'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc' , 962 'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc' ,
963 'system/chromeos/multi_user/user_switch_util_unittest.cc', 963 'system/chromeos/multi_user/user_switch_util_unittest.cc',
964 'system/chromeos/power/power_event_observer_unittest.cc', 964 'system/chromeos/power/power_event_observer_unittest.cc',
965 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', 965 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
966 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 966 'system/chromeos/screen_security/screen_tray_item_unittest.cc',
967 'system/chromeos/session/logout_confirmation_controller_unittest.cc',
968 'system/chromeos/session/tray_session_length_limit_unittest.cc',
969 'system/chromeos/supervised/tray_supervised_user_unittest.cc', 967 'system/chromeos/supervised/tray_supervised_user_unittest.cc',
970 'system/chromeos/tray_display_unittest.cc', 968 'system/chromeos/tray_display_unittest.cc',
971 'system/overview/overview_button_tray_unittest.cc', 969 'system/overview/overview_button_tray_unittest.cc',
972 'system/toast/toast_manager_unittest.cc', 970 'system/toast/toast_manager_unittest.cc',
973 'system/tray/system_tray_unittest.cc', 971 'system/tray/system_tray_unittest.cc',
974 'system/user/tray_user_unittest.cc', 972 'system/user/tray_user_unittest.cc',
975 'system/web_notification/ash_popup_alignment_delegate_unittest.cc', 973 'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
976 'system/web_notification/web_notification_tray_unittest.cc', 974 'system/web_notification/web_notification_tray_unittest.cc',
977 'test/ash_test_helper_unittest.cc', 975 'test/ash_test_helper_unittest.cc',
978 'test/ash_unittests.cc', 976 'test/ash_unittests.cc',
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1447 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1450 ], 1448 ],
1451 } 1449 }
1452 ], 1450 ],
1453 ], 1451 ],
1454 }, 1452 },
1455 ], 1453 ],
1456 }], 1454 }],
1457 ], 1455 ],
1458 } 1456 }
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/session/last_window_closed_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698