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

Side by Side Diff: ash/ash.gyp

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/DEPS ('k') | ash/ash_resources.gypi » ('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 'includes': [
11 'ash_resources.gypi',
12 ],
11 'targets': [ 13 'targets': [
12 { 14 {
13 'target_name': 'ash', 15 'target_name': 'ash',
14 'type': '<(component)', 16 'type': '<(component)',
15 'dependencies': [ 17 'dependencies': [
16 'ash_strings.gyp:ash_strings', 18 'ash_strings.gyp:ash_strings',
17 '../base/base.gyp:base', 19 '../base/base.gyp:base',
18 '../base/base.gyp:base_i18n', 20 '../base/base.gyp:base_i18n',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 21 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 '../build/temp_gyp/googleurl.gyp:googleurl', 22 '../build/temp_gyp/googleurl.gyp:googleurl',
21 '../content/content.gyp:content', 23 '../content/content.gyp:content',
22 '../content/content.gyp:content_browser', 24 '../content/content.gyp:content_browser',
23 '../ipc/ipc.gyp:ipc', 25 '../ipc/ipc.gyp:ipc',
24 '../net/net.gyp:net', 26 '../net/net.gyp:net',
25 '../skia/skia.gyp:skia', 27 '../skia/skia.gyp:skia',
26 '../third_party/icu/icu.gyp:icui18n', 28 '../third_party/icu/icu.gyp:icui18n',
27 '../third_party/icu/icu.gyp:icuuc', 29 '../third_party/icu/icu.gyp:icuuc',
28 '../ui/app_list/app_list.gyp:app_list', 30 '../ui/app_list/app_list.gyp:app_list',
29 '../ui/aura/aura.gyp:aura', 31 '../ui/aura/aura.gyp:aura',
30 '../ui/base/strings/ui_strings.gyp:ui_strings', 32 '../ui/base/strings/ui_strings.gyp:ui_strings',
31 '../ui/compositor/compositor.gyp:compositor', 33 '../ui/compositor/compositor.gyp:compositor',
32 '../ui/oak/oak.gyp:oak', 34 '../ui/oak/oak.gyp:oak',
33 '../ui/ui.gyp:ui', 35 '../ui/ui.gyp:ui',
34 '../ui/ui.gyp:ui_resources', 36 '../ui/ui.gyp:ui_resources',
35 '../ui/ui.gyp:ui_resources_wallpapers', 37 '../ui/ui.gyp:ui_resources_wallpapers',
36 '../ui/views/controls/webview/webview.gyp:webview', 38 '../ui/views/controls/webview/webview.gyp:webview',
37 '../ui/views/views.gyp:views', 39 '../ui/views/views.gyp:views',
38 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 40 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
41 'ash_resources',
39 ], 42 ],
40 'defines': [ 43 'defines': [
41 'ASH_IMPLEMENTATION', 44 'ASH_IMPLEMENTATION',
42 ], 45 ],
43 'sources': [ 46 'sources': [
44 # All .cc, .h under ash, except unittests 47 # All .cc, .h under ash, except unittests
45 'accelerators/accelerator_controller.cc', 48 'accelerators/accelerator_controller.cc',
46 'accelerators/accelerator_controller.h', 49 'accelerators/accelerator_controller.h',
47 'accelerators/accelerator_dispatcher.cc', 50 'accelerators/accelerator_dispatcher.cc',
48 'accelerators/accelerator_dispatcher.h', 51 'accelerators/accelerator_dispatcher.h',
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 '../ui/app_list/app_list.gyp:app_list', 437 '../ui/app_list/app_list.gyp:app_list',
435 '../ui/compositor/compositor.gyp:compositor', 438 '../ui/compositor/compositor.gyp:compositor',
436 '../ui/compositor/compositor.gyp:compositor_test_support', 439 '../ui/compositor/compositor.gyp:compositor_test_support',
437 '../ui/ui.gyp:ui', 440 '../ui/ui.gyp:ui',
438 '../ui/ui.gyp:ui_resources', 441 '../ui/ui.gyp:ui_resources',
439 '../ui/ui.gyp:ui_test_support', 442 '../ui/ui.gyp:ui_test_support',
440 '../ui/views/views.gyp:views', 443 '../ui/views/views.gyp:views',
441 '../ui/views/views.gyp:views_examples_with_content_lib', 444 '../ui/views/views.gyp:views_examples_with_content_lib',
442 '../ui/views/views.gyp:test_support_views', 445 '../ui/views/views.gyp:test_support_views',
443 'ash', 446 'ash',
447 'ash_resources',
444 ], 448 ],
445 'sources': [ 449 'sources': [
446 '../ui/views/test/test_views_delegate.cc', 450 '../ui/views/test/test_views_delegate.cc',
447 '../ui/views/test/test_views_delegate.h', 451 '../ui/views/test/test_views_delegate.h',
448 'accelerators/accelerator_controller_unittest.cc', 452 'accelerators/accelerator_controller_unittest.cc',
449 'accelerators/accelerator_filter_unittest.cc', 453 'accelerators/accelerator_filter_unittest.cc',
450 'accelerators/accelerator_table_unittest.cc', 454 'accelerators/accelerator_table_unittest.cc',
451 'accelerators/nested_dispatcher_controller_unittest.cc', 455 'accelerators/nested_dispatcher_controller_unittest.cc',
452 'dip_unittest.cc', 456 'dip_unittest.cc',
453 'display/display_controller_unittest.cc', 457 'display/display_controller_unittest.cc',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 '../ui/app_list/app_list.gyp:app_list', 579 '../ui/app_list/app_list.gyp:app_list',
576 '../ui/aura/aura.gyp:aura', 580 '../ui/aura/aura.gyp:aura',
577 '../ui/compositor/compositor.gyp:compositor', 581 '../ui/compositor/compositor.gyp:compositor',
578 '../ui/compositor/compositor.gyp:compositor_test_support', 582 '../ui/compositor/compositor.gyp:compositor_test_support',
579 '../ui/ui.gyp:ui', 583 '../ui/ui.gyp:ui',
580 '../ui/ui.gyp:ui_resources', 584 '../ui/ui.gyp:ui_resources',
581 '../ui/views/views.gyp:views', 585 '../ui/views/views.gyp:views',
582 '../ui/views/views.gyp:views_examples_with_content_lib', 586 '../ui/views/views.gyp:views_examples_with_content_lib',
583 '../ui/views/views.gyp:test_support_views', 587 '../ui/views/views.gyp:test_support_views',
584 'ash', 588 'ash',
589 'ash_resources',
585 ], 590 ],
586 'sources': [ 591 'sources': [
587 'shell/app_list.cc', 592 'shell/app_list.cc',
588 'shell/bubble.cc', 593 'shell/bubble.cc',
589 'shell/content_client/shell_browser_main_parts.cc', 594 'shell/content_client/shell_browser_main_parts.cc',
590 'shell/content_client/shell_browser_main_parts.h', 595 'shell/content_client/shell_browser_main_parts.h',
591 'shell/content_client/shell_content_browser_client.cc', 596 'shell/content_client/shell_content_browser_client.cc',
592 'shell/content_client/shell_content_browser_client.h', 597 'shell/content_client/shell_content_browser_client.h',
593 'shell/content_client/shell_main_delegate.cc', 598 'shell/content_client/shell_main_delegate.cc',
594 'shell/content_client/shell_main_delegate.h', 599 'shell/content_client/shell_main_delegate.h',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 'shell/cocoa/app-Info.plist', 648 'shell/cocoa/app-Info.plist',
644 ], 649 ],
645 'xcode_settings': { 650 'xcode_settings': {
646 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 651 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
647 }, 652 },
648 }], 653 }],
649 ], 654 ],
650 }, 655 },
651 ], 656 ],
652 } 657 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/ash_resources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698