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

Side by Side Diff: ash/ash.gyp

Issue 11026075: Include wallpaper to win_aura's executables (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « no previous file | ash/resources/ash_wallpaper_resources.grd » ('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 'includes': [ 10 'includes': [
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'wm/workspace_controller_test_helper.h', 546 'wm/workspace_controller_test_helper.h',
547 'wm/workspace/magnetism_matcher_unittest.cc', 547 'wm/workspace/magnetism_matcher_unittest.cc',
548 'wm/workspace/multi_window_resize_controller_unittest.cc', 548 'wm/workspace/multi_window_resize_controller_unittest.cc',
549 'wm/workspace/workspace_event_handler_test_helper.cc', 549 'wm/workspace/workspace_event_handler_test_helper.cc',
550 'wm/workspace/workspace_event_handler_test_helper.h', 550 'wm/workspace/workspace_event_handler_test_helper.h',
551 'wm/workspace/workspace_event_handler_unittest.cc', 551 'wm/workspace/workspace_event_handler_unittest.cc',
552 'wm/workspace/workspace_layout_manager2_unittest.cc', 552 'wm/workspace/workspace_layout_manager2_unittest.cc',
553 'wm/workspace/workspace_manager_unittest.cc', 553 'wm/workspace/workspace_manager_unittest.cc',
554 'wm/workspace/workspace_manager2_unittest.cc', 554 'wm/workspace/workspace_manager2_unittest.cc',
555 'wm/workspace/workspace_window_resizer_unittest.cc', 555 'wm/workspace/workspace_window_resizer_unittest.cc',
556 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc ',
556 ], 557 ],
557 'conditions': [ 558 'conditions': [
558 ['use_ibus==1', { 559 ['use_ibus==1', {
559 'dependencies': [ 560 'dependencies': [
560 '../build/linux/system.gyp:ibus', 561 '../build/linux/system.gyp:ibus',
561 ], 562 ],
562 }], 563 }],
563 ['OS=="win"', { 564 ['OS=="win"', {
564 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 565 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6
565 'sources/': [ 566 'sources/': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 'shell/shell_main_parts_mac.mm', 632 'shell/shell_main_parts_mac.mm',
632 'shell/toplevel_window.cc', 633 'shell/toplevel_window.cc',
633 'shell/toplevel_window.h', 634 'shell/toplevel_window.h',
634 'shell/widgets.cc', 635 'shell/widgets.cc',
635 'shell/window_type_launcher.cc', 636 'shell/window_type_launcher.cc',
636 'shell/window_type_launcher.h', 637 'shell/window_type_launcher.h',
637 'shell/window_watcher.cc', 638 'shell/window_watcher.cc',
638 'shell/window_watcher.h', 639 'shell/window_watcher.h',
639 '../content/app/startup_helper_win.cc', 640 '../content/app/startup_helper_win.cc',
640 '../ui/views/test/test_views_delegate.cc', 641 '../ui/views/test/test_views_delegate.cc',
642 '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc ',
641 ], 643 ],
642 'conditions': [ 644 'conditions': [
643 ['OS=="win"', { 645 ['OS=="win"', {
644 'msvs_settings': { 646 'msvs_settings': {
645 'VCLinkerTool': { 647 'VCLinkerTool': {
646 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 648 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
647 }, 649 },
648 }, 650 },
649 'dependencies': [ 651 'dependencies': [
650 '../sandbox/sandbox.gyp:sandbox', 652 '../sandbox/sandbox.gyp:sandbox',
(...skipping 17 matching lines...) Expand all
668 'shell/cocoa/app-Info.plist', 670 'shell/cocoa/app-Info.plist',
669 ], 671 ],
670 'xcode_settings': { 672 'xcode_settings': {
671 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 673 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
672 }, 674 },
673 }], 675 }],
674 ], 676 ],
675 }, 677 },
676 ], 678 ],
677 } 679 }
OLDNEW
« no previous file with comments | « no previous file | ash/resources/ash_wallpaper_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698