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

Side by Side Diff: trunk/src/ui/views/views.gyp

Issue 25161002: Revert 225857 "gfx: Create a separate gfx component out of ui." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 12 matching lines...) Expand all
23 'dependencies': [ 23 'dependencies': [
24 '../../base/base.gyp:base', 24 '../../base/base.gyp:base',
25 '../../base/base.gyp:base_i18n', 25 '../../base/base.gyp:base_i18n',
26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
27 '../../skia/skia.gyp:skia', 27 '../../skia/skia.gyp:skia',
28 '../../third_party/icu/icu.gyp:icui18n', 28 '../../third_party/icu/icu.gyp:icui18n',
29 '../../third_party/icu/icu.gyp:icuuc', 29 '../../third_party/icu/icu.gyp:icuuc',
30 '../../url/url.gyp:url_lib', 30 '../../url/url.gyp:url_lib',
31 '../base/strings/ui_strings.gyp:ui_strings', 31 '../base/strings/ui_strings.gyp:ui_strings',
32 '../compositor/compositor.gyp:compositor', 32 '../compositor/compositor.gyp:compositor',
33 '../gfx/gfx.gyp:gfx',
34 '../native_theme/native_theme.gyp:native_theme', 33 '../native_theme/native_theme.gyp:native_theme',
35 '../ui.gyp:ui', 34 '../ui.gyp:ui',
36 '../ui.gyp:ui_resources', 35 '../ui.gyp:ui_resources',
37 ], 36 ],
38 'defines': [ 37 'defines': [
39 'VIEWS_IMPLEMENTATION', 38 'VIEWS_IMPLEMENTATION',
40 ], 39 ],
41 'sources': [ 40 'sources': [
42 # All .cc, .h under views, except unittests 41 # All .cc, .h under views, except unittests
43 'accessibility/native_view_accessibility.cc', 42 'accessibility/native_view_accessibility.cc',
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 ], 594 ],
596 }, # target_name: views 595 }, # target_name: views
597 { 596 {
598 'target_name': 'views_test_support', 597 'target_name': 'views_test_support',
599 'type': 'static_library', 598 'type': 'static_library',
600 'dependencies': [ 599 'dependencies': [
601 '../../base/base.gyp:base', 600 '../../base/base.gyp:base',
602 '../../ipc/ipc.gyp:test_support_ipc', 601 '../../ipc/ipc.gyp:test_support_ipc',
603 '../../skia/skia.gyp:skia', 602 '../../skia/skia.gyp:skia',
604 '../../testing/gtest.gyp:gtest', 603 '../../testing/gtest.gyp:gtest',
605 '../gfx/gfx.gyp:gfx',
606 '../ui.gyp:ui', 604 '../ui.gyp:ui',
607 'views', 605 'views',
608 ], 606 ],
609 'include_dirs': [ 607 'include_dirs': [
610 '..', 608 '..',
611 ], 609 ],
612 'sources': [ 610 'sources': [
613 'corewm/tooltip_controller_test_helper.cc', 611 'corewm/tooltip_controller_test_helper.cc',
614 'corewm/tooltip_controller_test_helper.h', 612 'corewm/tooltip_controller_test_helper.h',
615 'test/capture_tracking_view.cc', 613 'test/capture_tracking_view.cc',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 { 647 {
650 'target_name': 'views_with_content_test_support', 648 'target_name': 'views_with_content_test_support',
651 'type': 'static_library', 649 'type': 'static_library',
652 'dependencies': [ 650 'dependencies': [
653 '../../base/base.gyp:base', 651 '../../base/base.gyp:base',
654 '../../content/content.gyp:content', 652 '../../content/content.gyp:content',
655 '../../content/content.gyp:test_support_content', 653 '../../content/content.gyp:test_support_content',
656 '../../ipc/ipc.gyp:test_support_ipc', 654 '../../ipc/ipc.gyp:test_support_ipc',
657 '../../skia/skia.gyp:skia', 655 '../../skia/skia.gyp:skia',
658 '../../testing/gtest.gyp:gtest', 656 '../../testing/gtest.gyp:gtest',
659 '../gfx/gfx.gyp:gfx',
660 '../ui.gyp:ui', 657 '../ui.gyp:ui',
661 'controls/webview/webview.gyp:webview', 658 'controls/webview/webview.gyp:webview',
662 'views_test_support', 659 'views_test_support',
663 'views', 660 'views',
664 ], 661 ],
665 'include_dirs': [ 662 'include_dirs': [
666 '..', 663 '..',
667 ], 664 ],
668 'sources': [ 665 'sources': [
669 'test/webview_test_helper.cc', 666 'test/webview_test_helper.cc',
(...skipping 13 matching lines...) Expand all
683 '../../chrome/chrome_resources.gyp:packed_resources', 680 '../../chrome/chrome_resources.gyp:packed_resources',
684 '../../skia/skia.gyp:skia', 681 '../../skia/skia.gyp:skia',
685 '../../testing/gmock.gyp:gmock', 682 '../../testing/gmock.gyp:gmock',
686 '../../testing/gtest.gyp:gtest', 683 '../../testing/gtest.gyp:gtest',
687 '../../third_party/icu/icu.gyp:icui18n', 684 '../../third_party/icu/icu.gyp:icui18n',
688 '../../third_party/icu/icu.gyp:icuuc', 685 '../../third_party/icu/icu.gyp:icuuc',
689 '../../url/url.gyp:url_lib', 686 '../../url/url.gyp:url_lib',
690 '../base/strings/ui_strings.gyp:ui_strings', 687 '../base/strings/ui_strings.gyp:ui_strings',
691 '../compositor/compositor.gyp:compositor', 688 '../compositor/compositor.gyp:compositor',
692 '../compositor/compositor.gyp:compositor_test_support', 689 '../compositor/compositor.gyp:compositor_test_support',
693 '../gfx/gfx.gyp:gfx',
694 '../ui.gyp:ui', 690 '../ui.gyp:ui',
695 '../ui.gyp:ui_resources', 691 '../ui.gyp:ui_resources',
696 '../ui.gyp:ui_test_support', 692 '../ui.gyp:ui_test_support',
697 'views', 693 'views',
698 'views_test_support', 694 'views_test_support',
699 ], 695 ],
700 'include_dirs': [ 696 'include_dirs': [
701 '..', 697 '..',
702 ], 698 ],
703 'sources': [ 699 'sources': [
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 }, # target_name: views_unittests 823 }, # target_name: views_unittests
828 { 824 {
829 'target_name': 'views_examples_lib', 825 'target_name': 'views_examples_lib',
830 'type': '<(component)', 826 'type': '<(component)',
831 'dependencies': [ 827 'dependencies': [
832 '../../base/base.gyp:base', 828 '../../base/base.gyp:base',
833 '../../chrome/chrome_resources.gyp:packed_resources', 829 '../../chrome/chrome_resources.gyp:packed_resources',
834 '../../skia/skia.gyp:skia', 830 '../../skia/skia.gyp:skia',
835 '../../third_party/icu/icu.gyp:icui18n', 831 '../../third_party/icu/icu.gyp:icui18n',
836 '../../third_party/icu/icu.gyp:icuuc', 832 '../../third_party/icu/icu.gyp:icuuc',
837 '../gfx/gfx.gyp:gfx',
838 '../ui.gyp:ui', 833 '../ui.gyp:ui',
839 '../ui.gyp:ui_resources', 834 '../ui.gyp:ui_resources',
840 'views', 835 'views',
841 ], 836 ],
842 'include_dirs': [ 837 'include_dirs': [
843 '..', 838 '..',
844 ], 839 ],
845 'defines': [ 840 'defines': [
846 'VIEWS_EXAMPLES_IMPLEMENTATION', 841 'VIEWS_EXAMPLES_IMPLEMENTATION',
847 ], 842 ],
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 'type': '<(component)', 915 'type': '<(component)',
921 'dependencies': [ 916 'dependencies': [
922 '../../base/base.gyp:base', 917 '../../base/base.gyp:base',
923 '../../base/base.gyp:base_i18n', 918 '../../base/base.gyp:base_i18n',
924 '../../chrome/chrome_resources.gyp:packed_resources', 919 '../../chrome/chrome_resources.gyp:packed_resources',
925 '../../content/content.gyp:content', 920 '../../content/content.gyp:content',
926 '../../skia/skia.gyp:skia', 921 '../../skia/skia.gyp:skia',
927 '../../third_party/icu/icu.gyp:icui18n', 922 '../../third_party/icu/icu.gyp:icui18n',
928 '../../third_party/icu/icu.gyp:icuuc', 923 '../../third_party/icu/icu.gyp:icuuc',
929 '../../url/url.gyp:url_lib', 924 '../../url/url.gyp:url_lib',
930 '../gfx/gfx.gyp:gfx',
931 '../ui.gyp:ui', 925 '../ui.gyp:ui',
932 '../ui.gyp:ui_resources', 926 '../ui.gyp:ui_resources',
933 'controls/webview/webview.gyp:webview', 927 'controls/webview/webview.gyp:webview',
934 'views', 928 'views',
935 ], 929 ],
936 'include_dirs': [ 930 'include_dirs': [
937 '..', 931 '..',
938 ], 932 ],
939 'defines': [ 933 'defines': [
940 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION', 934 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 'dependencies': [ 1004 'dependencies': [
1011 '../../base/base.gyp:base', 1005 '../../base/base.gyp:base',
1012 '../../base/base.gyp:base_i18n', 1006 '../../base/base.gyp:base_i18n',
1013 '../../chrome/chrome_resources.gyp:packed_resources', 1007 '../../chrome/chrome_resources.gyp:packed_resources',
1014 '../../content/content.gyp:content', 1008 '../../content/content.gyp:content',
1015 '../../content/content.gyp:content_shell_lib', 1009 '../../content/content.gyp:content_shell_lib',
1016 '../../content/content.gyp:test_support_content', 1010 '../../content/content.gyp:test_support_content',
1017 '../../skia/skia.gyp:skia', 1011 '../../skia/skia.gyp:skia',
1018 '../../third_party/icu/icu.gyp:icui18n', 1012 '../../third_party/icu/icu.gyp:icui18n',
1019 '../../third_party/icu/icu.gyp:icuuc', 1013 '../../third_party/icu/icu.gyp:icuuc',
1020 '../gfx/gfx.gyp:gfx',
1021 '../ui.gyp:ui', 1014 '../ui.gyp:ui',
1022 '../ui.gyp:ui_resources', 1015 '../ui.gyp:ui_resources',
1023 'views', 1016 'views',
1024 'views_examples_with_content_lib', 1017 'views_examples_with_content_lib',
1025 'views_test_support' 1018 'views_test_support'
1026 ], 1019 ],
1027 'include_dirs': [ 1020 'include_dirs': [
1028 '../..', 1021 '../..',
1029 ], 1022 ],
1030 'sources': [ 1023 'sources': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 'sources/': [ 1061 'sources/': [
1069 # This is needed because the aura rule strips it from the default 1062 # This is needed because the aura rule strips it from the default
1070 # sources list. 1063 # sources list.
1071 ['include', '^../../content/app/startup_helper_win.cc'], 1064 ['include', '^../../content/app/startup_helper_win.cc'],
1072 ], 1065 ],
1073 }], 1066 }],
1074 ], 1067 ],
1075 }, # target_name: views_examples_with_content_exe 1068 }, # target_name: views_examples_with_content_exe
1076 ], 1069 ],
1077 } 1070 }
OLDNEW
« no previous file with comments | « trunk/src/ui/views/controls/webview/webview.gyp ('k') | trunk/src/webkit/common/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698