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

Side by Side Diff: trunk/src/ash/ash.gyp

Issue 15838015: Revert 202787 "Remove unnecessary ui::CompositorTestSupport" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | trunk/src/ash/shell/content_client/shell_browser_main_parts.cc » ('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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 '../content/content.gyp:test_support_content', 599 '../content/content.gyp:test_support_content',
600 '../build/temp_gyp/googleurl.gyp:googleurl', 600 '../build/temp_gyp/googleurl.gyp:googleurl',
601 '../skia/skia.gyp:skia', 601 '../skia/skia.gyp:skia',
602 '../testing/gtest.gyp:gtest', 602 '../testing/gtest.gyp:gtest',
603 '../third_party/icu/icu.gyp:icui18n', 603 '../third_party/icu/icu.gyp:icui18n',
604 '../third_party/icu/icu.gyp:icuuc', 604 '../third_party/icu/icu.gyp:icuuc',
605 '../ui/aura/aura.gyp:aura', 605 '../ui/aura/aura.gyp:aura',
606 '../ui/aura/aura.gyp:aura_test_support', 606 '../ui/aura/aura.gyp:aura_test_support',
607 '../ui/app_list/app_list.gyp:app_list', 607 '../ui/app_list/app_list.gyp:app_list',
608 '../ui/compositor/compositor.gyp:compositor', 608 '../ui/compositor/compositor.gyp:compositor',
609 '../ui/compositor/compositor.gyp:compositor_test_support',
609 '../ui/keyboard/keyboard.gyp:keyboard', 610 '../ui/keyboard/keyboard.gyp:keyboard',
610 '../ui/message_center/message_center.gyp:message_center', 611 '../ui/message_center/message_center.gyp:message_center',
611 '../ui/ui.gyp:ui', 612 '../ui/ui.gyp:ui',
612 '../ui/ui.gyp:ui_resources', 613 '../ui/ui.gyp:ui_resources',
613 '../ui/ui.gyp:ui_test_support', 614 '../ui/ui.gyp:ui_test_support',
614 '../ui/views/views.gyp:views', 615 '../ui/views/views.gyp:views',
615 '../ui/views/views.gyp:views_test_support', 616 '../ui/views/views.gyp:views_test_support',
616 '../ui/views/views.gyp:views_examples_with_content_lib', 617 '../ui/views/views.gyp:views_examples_with_content_lib',
617 '../ui/views/views.gyp:views_with_content_test_support', 618 '../ui/views/views.gyp:views_with_content_test_support',
618 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', 619 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 '../base/base.gyp:base_i18n', 769 '../base/base.gyp:base_i18n',
769 '../chrome/chrome_resources.gyp:packed_resources', 770 '../chrome/chrome_resources.gyp:packed_resources',
770 '../content/content.gyp:content_shell_lib', 771 '../content/content.gyp:content_shell_lib',
771 '../content/content.gyp:content', 772 '../content/content.gyp:content',
772 '../skia/skia.gyp:skia', 773 '../skia/skia.gyp:skia',
773 '../third_party/icu/icu.gyp:icui18n', 774 '../third_party/icu/icu.gyp:icui18n',
774 '../third_party/icu/icu.gyp:icuuc', 775 '../third_party/icu/icu.gyp:icuuc',
775 '../ui/app_list/app_list.gyp:app_list', 776 '../ui/app_list/app_list.gyp:app_list',
776 '../ui/aura/aura.gyp:aura', 777 '../ui/aura/aura.gyp:aura',
777 '../ui/compositor/compositor.gyp:compositor', 778 '../ui/compositor/compositor.gyp:compositor',
779 '../ui/compositor/compositor.gyp:compositor_test_support',
778 '../ui/keyboard/keyboard.gyp:keyboard', 780 '../ui/keyboard/keyboard.gyp:keyboard',
779 '../ui/message_center/message_center.gyp:message_center', 781 '../ui/message_center/message_center.gyp:message_center',
780 '../ui/ui.gyp:ui', 782 '../ui/ui.gyp:ui',
781 '../ui/ui.gyp:ui_resources', 783 '../ui/ui.gyp:ui_resources',
782 '../ui/views/views.gyp:views', 784 '../ui/views/views.gyp:views',
783 '../ui/views/views.gyp:views_examples_lib', 785 '../ui/views/views.gyp:views_examples_lib',
784 '../ui/views/views.gyp:views_examples_with_content_lib', 786 '../ui/views/views.gyp:views_examples_with_content_lib',
785 '../ui/views/views.gyp:views_test_support', 787 '../ui/views/views.gyp:views_test_support',
786 'ash', 788 'ash',
787 'ash_resources', 789 'ash_resources',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 'shell/cocoa/app-Info.plist', 853 'shell/cocoa/app-Info.plist',
852 ], 854 ],
853 'xcode_settings': { 855 'xcode_settings': {
854 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 856 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
855 }, 857 },
856 }], 858 }],
857 ], 859 ],
858 }, 860 },
859 ], 861 ],
860 } 862 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698