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

Side by Side Diff: ash/ash.gyp

Issue 10638010: Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests.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
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 'shell/shell_main_parts_mac.mm', 519 'shell/shell_main_parts_mac.mm',
520 'shell/toplevel_window.cc', 520 'shell/toplevel_window.cc',
521 'shell/toplevel_window.h', 521 'shell/toplevel_window.h',
522 'shell/widgets.cc', 522 'shell/widgets.cc',
523 'shell/window_type_launcher.cc', 523 'shell/window_type_launcher.cc',
524 'shell/window_type_launcher.h', 524 'shell/window_type_launcher.h',
525 'shell/window_watcher.cc', 525 'shell/window_watcher.cc',
526 'shell/window_watcher.h', 526 'shell/window_watcher.h',
527 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 527 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
528 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 528 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
529 '../content/app/startup_helper_win.cc',
529 '../ui/views/test/test_views_delegate.cc', 530 '../ui/views/test/test_views_delegate.cc',
530 ], 531 ],
531 'conditions': [ 532 'conditions': [
532 ['OS=="win"', { 533 ['OS=="win"', {
533 'msvs_settings': { 534 'msvs_settings': {
534 'VCLinkerTool': { 535 'VCLinkerTool': {
535 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 536 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
536 }, 537 },
537 }, 538 },
538 'dependencies': [ 539 'dependencies': [
(...skipping 18 matching lines...) Expand all
557 'shell/cocoa/app-Info.plist', 558 'shell/cocoa/app-Info.plist',
558 ], 559 ],
559 'xcode_settings': { 560 'xcode_settings': {
560 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 561 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
561 }, 562 },
562 }], 563 }],
563 ], 564 ],
564 }, 565 },
565 ], 566 ],
566 } 567 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698