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

Side by Side Diff: ash/ash.gyp

Issue 10820003: Remove ui_resources_default_100_percent.rc and theme_resources_default_100_percent.rc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 'wm/window_manager_unittest.cc', 442 'wm/window_manager_unittest.cc',
443 'wm/window_modality_controller_unittest.cc', 443 'wm/window_modality_controller_unittest.cc',
444 'wm/workspace_controller_test_helper.cc', 444 'wm/workspace_controller_test_helper.cc',
445 'wm/workspace_controller_test_helper.h', 445 'wm/workspace_controller_test_helper.h',
446 'wm/workspace/multi_window_resize_controller_unittest.cc', 446 'wm/workspace/multi_window_resize_controller_unittest.cc',
447 'wm/workspace/workspace_event_filter_test_helper.cc', 447 'wm/workspace/workspace_event_filter_test_helper.cc',
448 'wm/workspace/workspace_event_filter_test_helper.h', 448 'wm/workspace/workspace_event_filter_test_helper.h',
449 'wm/workspace/workspace_event_filter_unittest.cc', 449 'wm/workspace/workspace_event_filter_unittest.cc',
450 'wm/workspace/workspace_manager_unittest.cc', 450 'wm/workspace/workspace_manager_unittest.cc',
451 'wm/workspace/workspace_window_resizer_unittest.cc', 451 'wm/workspace/workspace_window_resizer_unittest.cc',
452
453 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' ,
454 ], 452 ],
455 'conditions': [ 453 'conditions': [
456 ['use_ibus==1', { 454 ['use_ibus==1', {
457 'dependencies': [ 455 'dependencies': [
458 '../build/linux/system.gyp:ibus', 456 '../build/linux/system.gyp:ibus',
459 ], 457 ],
460 }], 458 }],
461 ['OS=="win"', { 459 ['OS=="win"', {
462 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6 460 # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690 6
463 'sources/': [ 461 'sources/': [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 'shell/shell_main_parts.cc', 556 'shell/shell_main_parts.cc',
559 'shell/shell_main_parts.h', 557 'shell/shell_main_parts.h',
560 'shell/shell_main_parts_mac.mm', 558 'shell/shell_main_parts_mac.mm',
561 'shell/toplevel_window.cc', 559 'shell/toplevel_window.cc',
562 'shell/toplevel_window.h', 560 'shell/toplevel_window.h',
563 'shell/widgets.cc', 561 'shell/widgets.cc',
564 'shell/window_type_launcher.cc', 562 'shell/window_type_launcher.cc',
565 'shell/window_type_launcher.h', 563 'shell/window_type_launcher.h',
566 'shell/window_watcher.cc', 564 'shell/window_watcher.cc',
567 'shell/window_watcher.h', 565 'shell/window_watcher.h',
568 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' ,
569 '../content/app/startup_helper_win.cc', 566 '../content/app/startup_helper_win.cc',
570 '../ui/views/test/test_views_delegate.cc', 567 '../ui/views/test/test_views_delegate.cc',
571 ], 568 ],
572 'conditions': [ 569 'conditions': [
573 ['OS=="win"', { 570 ['OS=="win"', {
574 'msvs_settings': { 571 'msvs_settings': {
575 'VCLinkerTool': { 572 'VCLinkerTool': {
576 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 573 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
577 }, 574 },
578 }, 575 },
(...skipping 19 matching lines...) Expand all
598 'shell/cocoa/app-Info.plist', 595 'shell/cocoa/app-Info.plist',
599 ], 596 ],
600 'xcode_settings': { 597 'xcode_settings': {
601 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 598 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
602 }, 599 },
603 }], 600 }],
604 ], 601 ],
605 }, 602 },
606 ], 603 ],
607 } 604 }
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