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

Side by Side Diff: ash/ash.gyp

Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/app/theme/theme_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 10
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 'wm/window_modality_controller_unittest.cc', 446 'wm/window_modality_controller_unittest.cc',
447 'wm/workspace_controller_test_helper.cc', 447 'wm/workspace_controller_test_helper.cc',
448 'wm/workspace_controller_test_helper.h', 448 'wm/workspace_controller_test_helper.h',
449 'wm/workspace/multi_window_resize_controller_unittest.cc', 449 'wm/workspace/multi_window_resize_controller_unittest.cc',
450 'wm/workspace/workspace_event_filter_test_helper.cc', 450 'wm/workspace/workspace_event_filter_test_helper.cc',
451 'wm/workspace/workspace_event_filter_test_helper.h', 451 'wm/workspace/workspace_event_filter_test_helper.h',
452 'wm/workspace/workspace_event_filter_unittest.cc', 452 'wm/workspace/workspace_event_filter_unittest.cc',
453 'wm/workspace/workspace_manager_unittest.cc', 453 'wm/workspace/workspace_manager_unittest.cc',
454 'wm/workspace/workspace_window_resizer_unittest.cc', 454 'wm/workspace/workspace_window_resizer_unittest.cc',
455 455
456 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' , 456 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
457 ], 457 ],
458 'conditions': [ 458 'conditions': [
459 ['use_ibus==1', { 459 ['use_ibus==1', {
460 'dependencies': [ 460 'dependencies': [
461 '../build/linux/system.gyp:ibus', 461 '../build/linux/system.gyp:ibus',
462 ], 462 ],
463 }], 463 }],
464 ['OS=="win"', { 464 ['OS=="win"', {
465 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 465 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6
466 'sources/': [ 466 'sources/': [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 'shell/shell_main_parts.cc', 561 'shell/shell_main_parts.cc',
562 'shell/shell_main_parts.h', 562 'shell/shell_main_parts.h',
563 'shell/shell_main_parts_mac.mm', 563 'shell/shell_main_parts_mac.mm',
564 'shell/toplevel_window.cc', 564 'shell/toplevel_window.cc',
565 'shell/toplevel_window.h', 565 'shell/toplevel_window.h',
566 'shell/widgets.cc', 566 'shell/widgets.cc',
567 'shell/window_type_launcher.cc', 567 'shell/window_type_launcher.cc',
568 'shell/window_type_launcher.h', 568 'shell/window_type_launcher.h',
569 'shell/window_watcher.cc', 569 'shell/window_watcher.cc',
570 'shell/window_watcher.h', 570 'shell/window_watcher.h',
571 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' , 571 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
572 '../content/app/startup_helper_win.cc', 572 '../content/app/startup_helper_win.cc',
573 '../ui/views/test/test_views_delegate.cc', 573 '../ui/views/test/test_views_delegate.cc',
574 ], 574 ],
575 'conditions': [ 575 'conditions': [
576 ['OS=="win"', { 576 ['OS=="win"', {
577 'msvs_settings': { 577 'msvs_settings': {
578 'VCLinkerTool': { 578 'VCLinkerTool': {
579 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 579 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
580 }, 580 },
581 }, 581 },
(...skipping 19 matching lines...) Expand all
601 'shell/cocoa/app-Info.plist', 601 'shell/cocoa/app-Info.plist',
602 ], 602 ],
603 'xcode_settings': { 603 'xcode_settings': {
604 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 604 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
605 }, 605 },
606 }], 606 }],
607 ], 607 ],
608 }, 608 },
609 ], 609 ],
610 } 610 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698