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

Side by Side Diff: ash/ash.gyp

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix win_aura bot and comments in #5 Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/app_list/pagination_model_observer.h ('k') | 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 10
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ash', 13 'target_name': 'ash',
14 'type': '<(component)', 14 'type': '<(component)',
15 'dependencies': [ 15 'dependencies': [
16 'ash_strings.gyp:ash_strings', 16 'ash_strings.gyp:ash_strings',
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/base.gyp:base_i18n', 18 '../base/base.gyp:base_i18n',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 '../build/temp_gyp/googleurl.gyp:googleurl', 20 '../build/temp_gyp/googleurl.gyp:googleurl',
21 '../content/content.gyp:content', 21 '../content/content.gyp:content',
22 '../content/content.gyp:content_browser', 22 '../content/content.gyp:content_browser',
23 '../ipc/ipc.gyp:ipc', 23 '../ipc/ipc.gyp:ipc',
24 '../net/net.gyp:net', 24 '../net/net.gyp:net',
25 '../skia/skia.gyp:skia', 25 '../skia/skia.gyp:skia',
26 '../third_party/icu/icu.gyp:icui18n', 26 '../third_party/icu/icu.gyp:icui18n',
27 '../third_party/icu/icu.gyp:icuuc', 27 '../third_party/icu/icu.gyp:icuuc',
28 '../ui/app_list/app_list.gyp:app_list',
28 '../ui/aura/aura.gyp:aura', 29 '../ui/aura/aura.gyp:aura',
29 '../ui/base/strings/ui_strings.gyp:ui_strings', 30 '../ui/base/strings/ui_strings.gyp:ui_strings',
30 '../ui/compositor/compositor.gyp:compositor', 31 '../ui/compositor/compositor.gyp:compositor',
31 '../ui/oak/oak.gyp:oak', 32 '../ui/oak/oak.gyp:oak',
32 '../ui/ui.gyp:ui', 33 '../ui/ui.gyp:ui',
33 '../ui/ui.gyp:ui_resources', 34 '../ui/ui.gyp:ui_resources',
34 '../ui/ui.gyp:ui_resources_standard', 35 '../ui/ui.gyp:ui_resources_standard',
35 '../ui/views/views.gyp:views', 36 '../ui/views/views.gyp:views',
36 ], 37 ],
37 'defines': [ 38 'defines': [
38 'ASH_IMPLEMENTATION', 39 'ASH_IMPLEMENTATION',
39 ], 40 ],
40 'sources': [ 41 'sources': [
41 # All .cc, .h under ash, except unittests 42 # All .cc, .h under ash, except unittests
42 'accelerators/accelerator_controller.cc', 43 'accelerators/accelerator_controller.cc',
43 'accelerators/accelerator_controller.h', 44 'accelerators/accelerator_controller.h',
44 'accelerators/accelerator_dispatcher.cc', 45 'accelerators/accelerator_dispatcher.cc',
45 'accelerators/accelerator_dispatcher.h', 46 'accelerators/accelerator_dispatcher.h',
46 'accelerators/accelerator_filter.cc', 47 'accelerators/accelerator_filter.cc',
47 'accelerators/accelerator_filter.h', 48 'accelerators/accelerator_filter.h',
48 'accelerators/accelerator_table.cc', 49 'accelerators/accelerator_table.cc',
49 'accelerators/accelerator_table.h', 50 'accelerators/accelerator_table.h',
50 'accelerators/focus_manager_factory.cc', 51 'accelerators/focus_manager_factory.cc',
51 'accelerators/focus_manager_factory.h', 52 'accelerators/focus_manager_factory.h',
52 'accelerators/nested_dispatcher_controller.cc', 53 'accelerators/nested_dispatcher_controller.cc',
53 'accelerators/nested_dispatcher_controller.h', 54 'accelerators/nested_dispatcher_controller.h',
54 'app_list/app_list.cc',
55 'app_list/app_list.h',
56 'app_list/app_list_bubble_border.cc',
57 'app_list/app_list_bubble_border.h',
58 'app_list/app_list_item_model.cc',
59 'app_list/app_list_item_model.h',
60 'app_list/app_list_item_model_observer.h',
61 'app_list/app_list_item_view.cc',
62 'app_list/app_list_item_view.h',
63 'app_list/app_list_model.cc',
64 'app_list/app_list_model.h',
65 'app_list/app_list_model_view.cc',
66 'app_list/app_list_model_view.h',
67 'app_list/app_list_view.cc',
68 'app_list/app_list_view.h',
69 'app_list/app_list_view_delegate.h',
70 'app_list/drop_shadow_label.cc',
71 'app_list/drop_shadow_label.h',
72 'app_list/icon_cache.cc',
73 'app_list/icon_cache.h',
74 'app_list/page_switcher.cc',
75 'app_list/page_switcher.h',
76 'app_list/pagination_model.cc',
77 'app_list/pagination_model.h',
78 'app_list/pagination_model_observer.h',
79 'ash_switches.cc', 55 'ash_switches.cc',
80 'ash_switches.h', 56 'ash_switches.h',
81 'caps_lock_delegate.h', 57 'caps_lock_delegate.h',
82 'desktop_background/desktop_background_controller.cc', 58 'desktop_background/desktop_background_controller.cc',
83 'desktop_background/desktop_background_controller.h', 59 'desktop_background/desktop_background_controller.h',
84 'desktop_background/desktop_background_resources.cc', 60 'desktop_background/desktop_background_resources.cc',
85 'desktop_background/desktop_background_resources.h', 61 'desktop_background/desktop_background_resources.h',
86 'desktop_background/desktop_background_view.cc', 62 'desktop_background/desktop_background_view.cc',
87 'desktop_background/desktop_background_view.h', 63 'desktop_background/desktop_background_view.h',
88 'drag_drop/drag_drop_controller.cc', 64 'drag_drop/drag_drop_controller.cc',
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 'system/tray_update.cc', 167 'system/tray_update.cc',
192 'system/tray_update.h', 168 'system/tray_update.h',
193 'system/user/login_status.h', 169 'system/user/login_status.h',
194 'system/user/tray_user.cc', 170 'system/user/tray_user.cc',
195 'system/user/tray_user.h', 171 'system/user/tray_user.h',
196 'system/user/update_observer.h', 172 'system/user/update_observer.h',
197 'system/user/user_observer.h', 173 'system/user/user_observer.h',
198 'tooltips/tooltip_controller.cc', 174 'tooltips/tooltip_controller.cc',
199 'tooltips/tooltip_controller.h', 175 'tooltips/tooltip_controller.h',
200 'volume_control_delegate.h', 176 'volume_control_delegate.h',
177 'wm/app_list_controller.cc',
178 'wm/app_list_controller.h',
201 'wm/activation_controller.cc', 179 'wm/activation_controller.cc',
202 'wm/activation_controller.h', 180 'wm/activation_controller.h',
203 'wm/always_on_top_controller.cc', 181 'wm/always_on_top_controller.cc',
204 'wm/always_on_top_controller.h', 182 'wm/always_on_top_controller.h',
205 'wm/base_layout_manager.cc', 183 'wm/base_layout_manager.cc',
206 'wm/base_layout_manager.h', 184 'wm/base_layout_manager.h',
207 'wm/custom_frame_view_ash.cc', 185 'wm/custom_frame_view_ash.cc',
208 'wm/custom_frame_view_ash.h', 186 'wm/custom_frame_view_ash.h',
209 'wm/default_window_resizer.cc', 187 'wm/default_window_resizer.cc',
210 'wm/default_window_resizer.h', 188 'wm/default_window_resizer.h',
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 '../ui/views/views.gyp:test_support_views', 334 '../ui/views/views.gyp:test_support_views',
357 'ash', 335 'ash',
358 ], 336 ],
359 'sources': [ 337 'sources': [
360 '../ui/views/test/test_views_delegate.cc', 338 '../ui/views/test/test_views_delegate.cc',
361 '../ui/views/test/test_views_delegate.h', 339 '../ui/views/test/test_views_delegate.h',
362 'accelerators/accelerator_controller_unittest.cc', 340 'accelerators/accelerator_controller_unittest.cc',
363 'accelerators/accelerator_filter_unittest.cc', 341 'accelerators/accelerator_filter_unittest.cc',
364 'accelerators/accelerator_table_unittest.cc', 342 'accelerators/accelerator_table_unittest.cc',
365 'accelerators/nested_dispatcher_controller_unittest.cc', 343 'accelerators/nested_dispatcher_controller_unittest.cc',
366 'app_list/app_list_unittest.cc',
367 'dip_unittest.cc', 344 'dip_unittest.cc',
368 'drag_drop/drag_drop_controller_unittest.cc', 345 'drag_drop/drag_drop_controller_unittest.cc',
369 'focus_cycler_unittest.cc', 346 'focus_cycler_unittest.cc',
370 'ime/input_method_event_filter_unittest.cc', 347 'ime/input_method_event_filter_unittest.cc',
371 'launcher/launcher_context_menu_unittest.cc', 348 'launcher/launcher_context_menu_unittest.cc',
372 'launcher/launcher_model_unittest.cc', 349 'launcher/launcher_model_unittest.cc',
373 'launcher/launcher_unittest.cc', 350 'launcher/launcher_unittest.cc',
374 'launcher/launcher_view_unittest.cc', 351 'launcher/launcher_view_unittest.cc',
375 'monitor/multi_monitor_manager_unittest.cc', 352 'monitor/multi_monitor_manager_unittest.cc',
376 'screensaver/screensaver_view_unittest.cc', 353 'screensaver/screensaver_view_unittest.cc',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 'type': 'executable', 437 'type': 'executable',
461 'dependencies': [ 438 'dependencies': [
462 '../base/base.gyp:base', 439 '../base/base.gyp:base',
463 '../base/base.gyp:base_i18n', 440 '../base/base.gyp:base_i18n',
464 '../chrome/chrome_resources.gyp:packed_resources', 441 '../chrome/chrome_resources.gyp:packed_resources',
465 '../content/content.gyp:content_shell_lib', 442 '../content/content.gyp:content_shell_lib',
466 '../content/content.gyp:content', 443 '../content/content.gyp:content',
467 '../skia/skia.gyp:skia', 444 '../skia/skia.gyp:skia',
468 '../third_party/icu/icu.gyp:icui18n', 445 '../third_party/icu/icu.gyp:icui18n',
469 '../third_party/icu/icu.gyp:icuuc', 446 '../third_party/icu/icu.gyp:icuuc',
447 '../ui/app_list/app_list.gyp:app_list',
470 '../ui/aura/aura.gyp:aura', 448 '../ui/aura/aura.gyp:aura',
471 '../ui/compositor/compositor.gyp:compositor', 449 '../ui/compositor/compositor.gyp:compositor',
472 '../ui/compositor/compositor.gyp:compositor_test_support', 450 '../ui/compositor/compositor.gyp:compositor_test_support',
473 '../ui/ui.gyp:gfx_resources', 451 '../ui/ui.gyp:gfx_resources',
474 '../ui/ui.gyp:ui', 452 '../ui/ui.gyp:ui',
475 '../ui/ui.gyp:ui_resources', 453 '../ui/ui.gyp:ui_resources',
476 '../ui/ui.gyp:ui_resources_standard', 454 '../ui/ui.gyp:ui_resources_standard',
477 '../ui/views/views.gyp:views', 455 '../ui/views/views.gyp:views',
478 '../ui/views/views.gyp:views_examples_lib', 456 '../ui/views/views.gyp:views_examples_lib',
479 '../ui/views/views.gyp:test_support_views', 457 '../ui/views/views.gyp:test_support_views',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 'shell/cocoa/app-Info.plist', 520 'shell/cocoa/app-Info.plist',
543 ], 521 ],
544 'xcode_settings': { 522 'xcode_settings': {
545 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 523 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
546 }, 524 },
547 }], 525 }],
548 ], 526 ],
549 }, 527 },
550 ], 528 ],
551 } 529 }
OLDNEW
« no previous file with comments | « ash/app_list/pagination_model_observer.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698