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

Side by Side Diff: ash/ash.gyp

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y
Patch Set: nit Created 4 years, 6 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/aura/wm_shell_aura.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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 'common/system/chromeos/power/power_status.h', 111 'common/system/chromeos/power/power_status.h',
112 'common/system/chromeos/power/power_status_view.cc', 112 'common/system/chromeos/power/power_status_view.cc',
113 'common/system/chromeos/power/power_status_view.h', 113 'common/system/chromeos/power/power_status_view.h',
114 'common/system/chromeos/power/tray_power.cc', 114 'common/system/chromeos/power/tray_power.cc',
115 'common/system/chromeos/power/tray_power.h', 115 'common/system/chromeos/power/tray_power.h',
116 'common/system/chromeos/settings/tray_settings.cc', 116 'common/system/chromeos/settings/tray_settings.cc',
117 'common/system/chromeos/settings/tray_settings.h', 117 'common/system/chromeos/settings/tray_settings.h',
118 'common/system/chromeos/shutdown_policy_observer.h', 118 'common/system/chromeos/shutdown_policy_observer.h',
119 'common/system/chromeos/system_clock_observer.cc', 119 'common/system/chromeos/system_clock_observer.cc',
120 'common/system/chromeos/system_clock_observer.h', 120 'common/system/chromeos/system_clock_observer.h',
121 'common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
121 'common/system/date/clock_observer.h', 122 'common/system/date/clock_observer.h',
122 'common/system/date/date_default_view.cc', 123 'common/system/date/date_default_view.cc',
123 'common/system/date/date_default_view.h', 124 'common/system/date/date_default_view.h',
124 'common/system/date/date_view.cc', 125 'common/system/date/date_view.cc',
125 'common/system/date/date_view.h', 126 'common/system/date/date_view.h',
126 'common/system/date/tray_date.cc', 127 'common/system/date/tray_date.cc',
127 'common/system/date/tray_date.h', 128 'common/system/date/tray_date.h',
129 'common/system/ime/ime_observer.h',
130 'common/system/ime/tray_ime_chromeos.cc',
131 'common/system/ime/tray_ime_chromeos.h',
128 'common/system/networking_config_delegate.cc', 132 'common/system/networking_config_delegate.cc',
129 'common/system/networking_config_delegate.h', 133 'common/system/networking_config_delegate.h',
130 'common/system/system_notifier.cc', 134 'common/system/system_notifier.cc',
131 'common/system/system_notifier.h', 135 'common/system/system_notifier.h',
132 'common/system/tray/actionable_view.cc', 136 'common/system/tray/actionable_view.cc',
133 'common/system/tray/actionable_view.h', 137 'common/system/tray/actionable_view.h',
134 'common/system/tray/default_system_tray_delegate.cc', 138 'common/system/tray/default_system_tray_delegate.cc',
135 'common/system/tray/default_system_tray_delegate.h', 139 'common/system/tray/default_system_tray_delegate.h',
136 'common/system/tray/fixed_sized_image_view.cc', 140 'common/system/tray/fixed_sized_image_view.cc',
137 'common/system/tray/fixed_sized_image_view.h', 141 'common/system/tray/fixed_sized_image_view.h',
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 'system/chromeos/session/tray_session_length_limit.h', 567 'system/chromeos/session/tray_session_length_limit.h',
564 'system/chromeos/supervised/custodian_info_tray_observer.h', 568 'system/chromeos/supervised/custodian_info_tray_observer.h',
565 'system/chromeos/supervised/tray_supervised_user.cc', 569 'system/chromeos/supervised/tray_supervised_user.cc',
566 'system/chromeos/supervised/tray_supervised_user.h', 570 'system/chromeos/supervised/tray_supervised_user.h',
567 'system/chromeos/tray_caps_lock.cc', 571 'system/chromeos/tray_caps_lock.cc',
568 'system/chromeos/tray_caps_lock.h', 572 'system/chromeos/tray_caps_lock.h',
569 'system/chromeos/tray_display.cc', 573 'system/chromeos/tray_display.cc',
570 'system/chromeos/tray_display.h', 574 'system/chromeos/tray_display.h',
571 'system/chromeos/tray_tracing.cc', 575 'system/chromeos/tray_tracing.cc',
572 'system/chromeos/tray_tracing.h', 576 'system/chromeos/tray_tracing.h',
573 'system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
574 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc', 577 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
575 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h', 578 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
576 'system/ime/ime_observer.h',
577 'system/ime/tray_ime_chromeos.cc',
578 'system/ime/tray_ime_chromeos.h',
579 'system/keyboard_brightness/keyboard_brightness_control_delegate.h', 579 'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
580 'system/locale/locale_notification_controller.cc', 580 'system/locale/locale_notification_controller.cc',
581 'system/locale/locale_notification_controller.h', 581 'system/locale/locale_notification_controller.h',
582 'system/overview/overview_button_tray.cc', 582 'system/overview/overview_button_tray.cc',
583 'system/overview/overview_button_tray.h', 583 'system/overview/overview_button_tray.h',
584 'system/status_area_widget.cc', 584 'system/status_area_widget.cc',
585 'system/status_area_widget.h', 585 'system/status_area_widget.h',
586 'system/status_area_widget_delegate.cc', 586 'system/status_area_widget_delegate.cc',
587 'system/status_area_widget_delegate.h', 587 'system/status_area_widget_delegate.h',
588 'system/toast/toast_data.cc', 588 'system/toast/toast_data.cc',
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 'accelerators/spoken_feedback_toggler_unittest.cc', 896 'accelerators/spoken_feedback_toggler_unittest.cc',
897 'app_list/app_list_presenter_delegate_unittest.cc', 897 'app_list/app_list_presenter_delegate_unittest.cc',
898 'ash_touch_exploration_manager_chromeos_unittest.cc', 898 'ash_touch_exploration_manager_chromeos_unittest.cc',
899 'autoclick/autoclick_unittest.cc', 899 'autoclick/autoclick_unittest.cc',
900 'common/material_design/material_design_controller_unittest.cc', 900 'common/material_design/material_design_controller_unittest.cc',
901 'common/shelf/shelf_model_unittest.cc', 901 'common/shelf/shelf_model_unittest.cc',
902 'common/system/chromeos/power/power_status_unittest.cc', 902 'common/system/chromeos/power/power_status_unittest.cc',
903 'common/system/chromeos/power/power_status_view_unittest.cc', 903 'common/system/chromeos/power/power_status_view_unittest.cc',
904 'common/system/chromeos/power/tray_power_unittest.cc', 904 'common/system/chromeos/power/tray_power_unittest.cc',
905 'common/system/date/date_view_unittest.cc', 905 'common/system/date/date_view_unittest.cc',
906 'common/system/ime/tray_ime_chromeos_unittest.cc',
906 'common/system/tray/tray_details_view_unittest.cc', 907 'common/system/tray/tray_details_view_unittest.cc',
907 'common/system/update/tray_update_unittest.cc', 908 'common/system/update/tray_update_unittest.cc',
908 'content/display/screen_orientation_controller_chromeos_unittest.cc', 909 'content/display/screen_orientation_controller_chromeos_unittest.cc',
909 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 910 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
910 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc', 911 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
911 'desktop_background/desktop_background_controller_unittest.cc', 912 'desktop_background/desktop_background_controller_unittest.cc',
912 'dip_unittest.cc', 913 'dip_unittest.cc',
913 'display/cursor_window_controller_unittest.cc', 914 'display/cursor_window_controller_unittest.cc',
914 'display/display_change_observer_chromeos_unittest.cc', 915 'display/display_change_observer_chromeos_unittest.cc',
915 'display/display_color_manager_chromeos_unittest.cc', 916 'display/display_color_manager_chromeos_unittest.cc',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 'sticky_keys/sticky_keys_unittest.cc', 962 'sticky_keys/sticky_keys_unittest.cc',
962 'system/chromeos/brightness/tray_brightness_unittest.cc', 963 'system/chromeos/brightness/tray_brightness_unittest.cc',
963 'system/chromeos/multi_user/user_switch_util_unittest.cc', 964 'system/chromeos/multi_user/user_switch_util_unittest.cc',
964 'system/chromeos/power/power_event_observer_unittest.cc', 965 'system/chromeos/power/power_event_observer_unittest.cc',
965 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', 966 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
966 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 967 'system/chromeos/screen_security/screen_tray_item_unittest.cc',
967 'system/chromeos/session/logout_confirmation_controller_unittest.cc', 968 'system/chromeos/session/logout_confirmation_controller_unittest.cc',
968 'system/chromeos/session/tray_session_length_limit_unittest.cc', 969 'system/chromeos/session/tray_session_length_limit_unittest.cc',
969 'system/chromeos/supervised/tray_supervised_user_unittest.cc', 970 'system/chromeos/supervised/tray_supervised_user_unittest.cc',
970 'system/chromeos/tray_display_unittest.cc', 971 'system/chromeos/tray_display_unittest.cc',
971 'system/ime/tray_ime_chromeos_unittest.cc',
972 'system/overview/overview_button_tray_unittest.cc', 972 'system/overview/overview_button_tray_unittest.cc',
973 'system/toast/toast_manager_unittest.cc', 973 'system/toast/toast_manager_unittest.cc',
974 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc', 974 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
975 'system/tray/system_tray_unittest.cc', 975 'system/tray/system_tray_unittest.cc',
976 'system/user/tray_user_unittest.cc', 976 'system/user/tray_user_unittest.cc',
977 'system/web_notification/ash_popup_alignment_delegate_unittest.cc', 977 'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
978 'system/web_notification/web_notification_tray_unittest.cc', 978 'system/web_notification/web_notification_tray_unittest.cc',
979 'test/ash_test_helper_unittest.cc', 979 'test/ash_test_helper_unittest.cc',
980 'test/ash_unittests.cc', 980 'test/ash_unittests.cc',
981 'tooltips/tooltip_controller_unittest.cc', 981 'tooltips/tooltip_controller_unittest.cc',
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1455 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1456 ], 1456 ],
1457 } 1457 }
1458 ], 1458 ],
1459 ], 1459 ],
1460 }, 1460 },
1461 ], 1461 ],
1462 }], 1462 }],
1463 ], 1463 ],
1464 } 1464 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698