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

Side by Side Diff: ash/ash.gyp

Issue 1874043002: Reland of AppListController refactoring part 2: Ash's AppListShowerDelegate imlementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_app_list_2
Patch Set: Created 4 years, 8 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 | « ash/app_list/app_list_view_delegate_factory.h ('k') | no next file » | 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 10 matching lines...) Expand all
21 'accelerators/exit_warning_handler.h', 21 'accelerators/exit_warning_handler.h',
22 'accelerators/focus_manager_factory.cc', 22 'accelerators/focus_manager_factory.cc',
23 'accelerators/focus_manager_factory.h', 23 'accelerators/focus_manager_factory.h',
24 'accelerators/key_hold_detector.cc', 24 'accelerators/key_hold_detector.cc',
25 'accelerators/key_hold_detector.h', 25 'accelerators/key_hold_detector.h',
26 'accelerators/magnifier_key_scroller.cc', 26 'accelerators/magnifier_key_scroller.cc',
27 'accelerators/magnifier_key_scroller.h', 27 'accelerators/magnifier_key_scroller.h',
28 'accelerators/spoken_feedback_toggler.cc', 28 'accelerators/spoken_feedback_toggler.cc',
29 'accelerators/spoken_feedback_toggler.h', 29 'accelerators/spoken_feedback_toggler.h',
30 'accessibility_delegate.h', 30 'accessibility_delegate.h',
31 'app_list/app_list_shower_delegate.cc',
32 'app_list/app_list_shower_delegate.h',
33 'app_list/app_list_shower_delegate_factory.cc',
34 'app_list/app_list_shower_delegate_factory.h',
35 'app_list/app_list_view_delegate_factory.h',
31 'ash_constants.cc', 36 'ash_constants.cc',
32 'ash_constants.h', 37 'ash_constants.h',
33 'ash_export.h', 38 'ash_export.h',
34 'ash_layout_constants.cc', 39 'ash_layout_constants.cc',
35 'ash_layout_constants.h', 40 'ash_layout_constants.h',
36 'ash_switches.cc', 41 'ash_switches.cc',
37 'ash_switches.h', 42 'ash_switches.h',
38 'ash_touch_exploration_manager_chromeos.cc', 43 'ash_touch_exploration_manager_chromeos.cc',
39 'ash_touch_exploration_manager_chromeos.h', 44 'ash_touch_exploration_manager_chromeos.h',
40 'audio/sounds.cc', 45 'audio/sounds.cc',
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 'shell/content/shell_content_state_impl.cc', 811 'shell/content/shell_content_state_impl.cc',
807 'shell/content/shell_content_state_impl.h', 812 'shell/content/shell_content_state_impl.h',
808 ], 813 ],
809 'ash_unittests_sources': [ 814 'ash_unittests_sources': [
810 'accelerators/accelerator_commands_unittest.cc', 815 'accelerators/accelerator_commands_unittest.cc',
811 'accelerators/accelerator_controller_unittest.cc', 816 'accelerators/accelerator_controller_unittest.cc',
812 'accelerators/accelerator_filter_unittest.cc', 817 'accelerators/accelerator_filter_unittest.cc',
813 'accelerators/accelerator_table_unittest.cc', 818 'accelerators/accelerator_table_unittest.cc',
814 'accelerators/magnifier_key_scroller_unittest.cc', 819 'accelerators/magnifier_key_scroller_unittest.cc',
815 'accelerators/spoken_feedback_toggler_unittest.cc', 820 'accelerators/spoken_feedback_toggler_unittest.cc',
821 # TODO(mfomitchev): uncomment when ash::Shell is switched to using
822 # app_list::AppListShower instead of ash::AppListController.
823 # 'app_list/app_list_shower_delegate_unittest.cc',
816 'ash_touch_exploration_manager_chromeos_unittest.cc', 824 'ash_touch_exploration_manager_chromeos_unittest.cc',
817 'autoclick/autoclick_unittest.cc', 825 'autoclick/autoclick_unittest.cc',
818 'content/display/screen_orientation_controller_chromeos_unittest.cc', 826 'content/display/screen_orientation_controller_chromeos_unittest.cc',
819 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 827 'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
820 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc', 828 'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
821 'desktop_background/desktop_background_controller_unittest.cc', 829 'desktop_background/desktop_background_controller_unittest.cc',
822 'dip_unittest.cc', 830 'dip_unittest.cc',
823 'display/cursor_window_controller_unittest.cc', 831 'display/cursor_window_controller_unittest.cc',
824 'display/display_change_observer_chromeos_unittest.cc', 832 'display/display_change_observer_chromeos_unittest.cc',
825 'display/display_color_manager_chromeos_unittest.cc', 833 'display/display_color_manager_chromeos_unittest.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 '../components/components.gyp:signin_core_account_id', 969 '../components/components.gyp:signin_core_account_id',
962 '../components/components.gyp:user_manager', 970 '../components/components.gyp:user_manager',
963 '../components/components.gyp:wallpaper', 971 '../components/components.gyp:wallpaper',
964 '../media/media.gyp:media', 972 '../media/media.gyp:media',
965 '../net/net.gyp:net', 973 '../net/net.gyp:net',
966 '../skia/skia.gyp:skia', 974 '../skia/skia.gyp:skia',
967 '../third_party/icu/icu.gyp:icui18n', 975 '../third_party/icu/icu.gyp:icui18n',
968 '../third_party/icu/icu.gyp:icuuc', 976 '../third_party/icu/icu.gyp:icuuc',
969 '../ui/accessibility/accessibility.gyp:accessibility', 977 '../ui/accessibility/accessibility.gyp:accessibility',
970 '../ui/app_list/app_list.gyp:app_list', 978 '../ui/app_list/app_list.gyp:app_list',
979 '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
971 '../ui/aura/aura.gyp:aura', 980 '../ui/aura/aura.gyp:aura',
972 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', 981 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
973 '../ui/base/ui_base.gyp:ui_base', 982 '../ui/base/ui_base.gyp:ui_base',
974 '../ui/base/ui_base.gyp:ui_data_pack', 983 '../ui/base/ui_base.gyp:ui_data_pack',
975 '../ui/compositor/compositor.gyp:compositor', 984 '../ui/compositor/compositor.gyp:compositor',
976 '../ui/display/display.gyp:display', 985 '../ui/display/display.gyp:display',
977 '../ui/events/devices/events_devices.gyp:events_devices', 986 '../ui/events/devices/events_devices.gyp:events_devices',
978 '../ui/events/events.gyp:events', 987 '../ui/events/events.gyp:events',
979 '../ui/events/events.gyp:events_base', 988 '../ui/events/events.gyp:events_base',
980 '../ui/events/events.gyp:gesture_detection', 989 '../ui/events/events.gyp:gesture_detection',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 }, 1104 },
1096 { 1105 {
1097 # GN version: //ash:test_support 1106 # GN version: //ash:test_support
1098 'target_name': 'ash_test_support', 1107 'target_name': 'ash_test_support',
1099 'type': 'static_library', 1108 'type': 'static_library',
1100 'dependencies': [ 1109 'dependencies': [
1101 '../skia/skia.gyp:skia', 1110 '../skia/skia.gyp:skia',
1102 '../testing/gtest.gyp:gtest', 1111 '../testing/gtest.gyp:gtest',
1103 '../ui/accessibility/accessibility.gyp:ax_gen', 1112 '../ui/accessibility/accessibility.gyp:ax_gen',
1104 '../ui/app_list/app_list.gyp:app_list_test_support', 1113 '../ui/app_list/app_list.gyp:app_list_test_support',
1114 '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
1105 '../ui/events/devices/events_devices.gyp:events_devices', 1115 '../ui/events/devices/events_devices.gyp:events_devices',
1106 '../ui/views/views.gyp:views_test_support', 1116 '../ui/views/views.gyp:views_test_support',
1107 'ash', 1117 'ash',
1108 'ash_resources.gyp:ash_resources', 1118 'ash_resources.gyp:ash_resources',
1109 'ash_test_support_with_content', 1119 'ash_test_support_with_content',
1110 ], 1120 ],
1111 'sources': [ 1121 'sources': [
1112 '<@(ash_test_support_sources)', 1122 '<@(ash_test_support_sources)',
1113 ], 1123 ],
1114 'conditions': [ 1124 'conditions': [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 '../components/components.gyp:signin_core_account_id', 1167 '../components/components.gyp:signin_core_account_id',
1158 '../components/components.gyp:user_manager', 1168 '../components/components.gyp:user_manager',
1159 '../content/content.gyp:content_browser', 1169 '../content/content.gyp:content_browser',
1160 '../content/content_shell_and_tests.gyp:test_support_content', 1170 '../content/content_shell_and_tests.gyp:test_support_content',
1161 '../skia/skia.gyp:skia', 1171 '../skia/skia.gyp:skia',
1162 '../testing/gtest.gyp:gtest', 1172 '../testing/gtest.gyp:gtest',
1163 '../third_party/icu/icu.gyp:icui18n', 1173 '../third_party/icu/icu.gyp:icui18n',
1164 '../third_party/icu/icu.gyp:icuuc', 1174 '../third_party/icu/icu.gyp:icuuc',
1165 '../ui/accessibility/accessibility.gyp:accessibility', 1175 '../ui/accessibility/accessibility.gyp:accessibility',
1166 '../ui/app_list/app_list.gyp:app_list', 1176 '../ui/app_list/app_list.gyp:app_list',
1177 '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
1167 '../ui/aura/aura.gyp:aura', 1178 '../ui/aura/aura.gyp:aura',
1168 '../ui/aura/aura.gyp:aura_test_support', 1179 '../ui/aura/aura.gyp:aura_test_support',
1169 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', 1180 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
1170 '../ui/base/ui_base.gyp:ui_base', 1181 '../ui/base/ui_base.gyp:ui_base',
1171 '../ui/base/ui_base.gyp:ui_base_test_support', 1182 '../ui/base/ui_base.gyp:ui_base_test_support',
1172 '../ui/compositor/compositor.gyp:compositor', 1183 '../ui/compositor/compositor.gyp:compositor',
1173 '../ui/compositor/compositor.gyp:compositor_test_support', 1184 '../ui/compositor/compositor.gyp:compositor_test_support',
1174 '../ui/display/display.gyp:display', 1185 '../ui/display/display.gyp:display',
1175 '../ui/events/devices/events_devices.gyp:events_devices', 1186 '../ui/events/devices/events_devices.gyp:events_devices',
1176 '../ui/events/events.gyp:events', 1187 '../ui/events/events.gyp:events',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 'target_name': 'ash_shell_lib', 1267 'target_name': 'ash_shell_lib',
1257 'type': 'static_library', 1268 'type': 'static_library',
1258 'dependencies': [ 1269 'dependencies': [
1259 '../base/base.gyp:base', 1270 '../base/base.gyp:base',
1260 '../base/base.gyp:base_i18n', 1271 '../base/base.gyp:base_i18n',
1261 '../chrome/chrome_resources.gyp:packed_resources', 1272 '../chrome/chrome_resources.gyp:packed_resources',
1262 '../skia/skia.gyp:skia', 1273 '../skia/skia.gyp:skia',
1263 '../third_party/icu/icu.gyp:icui18n', 1274 '../third_party/icu/icu.gyp:icui18n',
1264 '../third_party/icu/icu.gyp:icuuc', 1275 '../third_party/icu/icu.gyp:icuuc',
1265 '../ui/app_list/app_list.gyp:app_list', 1276 '../ui/app_list/app_list.gyp:app_list',
1277 '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
1266 '../ui/aura/aura.gyp:aura', 1278 '../ui/aura/aura.gyp:aura',
1267 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', 1279 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
1268 '../ui/base/ui_base.gyp:ui_base', 1280 '../ui/base/ui_base.gyp:ui_base',
1269 '../ui/compositor/compositor.gyp:compositor', 1281 '../ui/compositor/compositor.gyp:compositor',
1270 '../ui/events/events.gyp:events', 1282 '../ui/events/events.gyp:events',
1271 '../ui/gfx/gfx.gyp:gfx', 1283 '../ui/gfx/gfx.gyp:gfx',
1272 '../ui/gfx/gfx.gyp:gfx_geometry', 1284 '../ui/gfx/gfx.gyp:gfx_geometry',
1273 '../ui/keyboard/keyboard.gyp:keyboard', 1285 '../ui/keyboard/keyboard.gyp:keyboard',
1274 '../ui/keyboard/keyboard.gyp:keyboard_with_content', 1286 '../ui/keyboard/keyboard.gyp:keyboard_with_content',
1275 '../ui/message_center/message_center.gyp:message_center', 1287 '../ui/message_center/message_center.gyp:message_center',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1373 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1362 ], 1374 ],
1363 } 1375 }
1364 ], 1376 ],
1365 ], 1377 ],
1366 }, 1378 },
1367 ], 1379 ],
1368 }], 1380 }],
1369 ], 1381 ],
1370 } 1382 }
OLDNEW
« no previous file with comments | « ash/app_list/app_list_view_delegate_factory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698