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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 201093002: Break cycles between views, content and webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert ash changes Created 6 years, 9 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 | « ui/views/examples/examples.gyp ('k') | no next file » | 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['OS!="linux" or chromeos==1', { 10 ['OS!="linux" or chromeos==1', {
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 'conditions': [ 544 'conditions': [
545 ['chromeos==1', { 545 ['chromeos==1', {
546 'sources!': [ 546 'sources!': [
547 'test/ui_controls_factory_desktop_aurax11.cc', 547 'test/ui_controls_factory_desktop_aurax11.cc',
548 'test/ui_controls_factory_desktop_aurax11.h', 548 'test/ui_controls_factory_desktop_aurax11.h',
549 ], 549 ],
550 }], 550 }],
551 ], 551 ],
552 }, # target_name: views_test_support 552 }, # target_name: views_test_support
553 { 553 {
554 'target_name': 'views_with_content_test_support',
555 'type': 'static_library',
556 'dependencies': [
557 '../../base/base.gyp:base',
558 '../../content/content.gyp:content',
559 '../../content/content_shell_and_tests.gyp:test_support_content',
560 '../../ipc/ipc.gyp:test_support_ipc',
561 '../../skia/skia.gyp:skia',
562 '../../testing/gtest.gyp:gtest',
563 '../aura/aura.gyp:aura',
564 '../base/ui_base.gyp:ui_base',
565 '../events/events.gyp:events',
566 '../gfx/gfx.gyp:gfx',
567 '../gfx/gfx.gyp:gfx_geometry',
568 'controls/webview/webview.gyp:webview',
569 'views_test_support',
570 'views',
571 ],
572 'include_dirs': [
573 '..',
574 ],
575 'sources': [
576 'test/webview_test_helper.cc',
577 'test/webview_test_helper.h',
578 ],
579 }, # target_name: views_with_content_test_support
580 {
581 'target_name': 'views_unittests', 554 'target_name': 'views_unittests',
582 'type': 'executable', 555 'type': 'executable',
583 'dependencies': [ 556 'dependencies': [
584 '../../base/base.gyp:base', 557 '../../base/base.gyp:base',
585 '../../base/base.gyp:base_i18n', 558 '../../base/base.gyp:base_i18n',
586 '../../base/base.gyp:test_support_base', 559 '../../base/base.gyp:test_support_base',
587 '../../skia/skia.gyp:skia', 560 '../../skia/skia.gyp:skia',
588 '../../testing/gtest.gyp:gtest', 561 '../../testing/gtest.gyp:gtest',
589 '../../third_party/icu/icu.gyp:icui18n', 562 '../../third_party/icu/icu.gyp:icui18n',
590 '../../third_party/icu/icu.gyp:icuuc', 563 '../../third_party/icu/icu.gyp:icuuc',
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 '../../base/allocator/allocator.gyp:allocator', 684 '../../base/allocator/allocator.gyp:allocator',
712 ], 685 ],
713 }], 686 }],
714 ['use_ozone==1', { 687 ['use_ozone==1', {
715 'sources!': [ 688 'sources!': [
716 'corewm/capture_controller_unittest.cc', 689 'corewm/capture_controller_unittest.cc',
717 ], 690 ],
718 }], 691 }],
719 ], 692 ],
720 }, # target_name: views_unittests 693 }, # target_name: views_unittests
721 {
722 'target_name': 'views_examples_lib',
723 'type': '<(component)',
724 'dependencies': [
725 '../../base/base.gyp:base',
726 '../../skia/skia.gyp:skia',
727 '../../third_party/icu/icu.gyp:icui18n',
728 '../../third_party/icu/icu.gyp:icuuc',
729 '../aura/aura.gyp:aura',
730 '../base/ui_base.gyp:ui_base',
731 '../events/events.gyp:events',
732 '../gfx/gfx.gyp:gfx',
733 '../gfx/gfx.gyp:gfx_geometry',
734 '../resources/ui_resources.gyp:ui_resources',
735 '../resources/ui_resources.gyp:ui_test_pak',
736 'views',
737 ],
738 'include_dirs': [
739 '..',
740 ],
741 'defines': [
742 'VIEWS_EXAMPLES_IMPLEMENTATION',
743 ],
744 'sources': [
745 'examples/bubble_example.cc',
746 'examples/bubble_example.h',
747 'examples/button_example.cc',
748 'examples/button_example.h',
749 'examples/checkbox_example.cc',
750 'examples/checkbox_example.h',
751 'examples/combobox_example.cc',
752 'examples/combobox_example.h',
753 'examples/double_split_view_example.cc',
754 'examples/double_split_view_example.h',
755 'examples/example_base.cc',
756 'examples/example_base.h',
757 'examples/example_combobox_model.cc',
758 'examples/example_combobox_model.h',
759 'examples/examples_window.cc',
760 'examples/examples_window.h',
761 'examples/label_example.cc',
762 'examples/label_example.h',
763 'examples/link_example.cc',
764 'examples/link_example.h',
765 'examples/message_box_example.cc',
766 'examples/message_box_example.h',
767 'examples/menu_example.cc',
768 'examples/menu_example.h',
769 'examples/multiline_example.cc',
770 'examples/multiline_example.h',
771 'examples/progress_bar_example.cc',
772 'examples/progress_bar_example.h',
773 'examples/radio_button_example.cc',
774 'examples/radio_button_example.h',
775 'examples/scroll_view_example.cc',
776 'examples/scroll_view_example.h',
777 'examples/single_split_view_example.cc',
778 'examples/single_split_view_example.h',
779 'examples/slider_example.cc',
780 'examples/slider_example.h',
781 'examples/tabbed_pane_example.cc',
782 'examples/tabbed_pane_example.h',
783 'examples/table_example.cc',
784 'examples/table_example.h',
785 'examples/text_example.cc',
786 'examples/text_example.h',
787 'examples/textfield_example.cc',
788 'examples/textfield_example.h',
789 'examples/throbber_example.cc',
790 'examples/throbber_example.h',
791 'examples/tree_view_example.cc',
792 'examples/tree_view_example.h',
793 'examples/views_examples_export.h',
794 'examples/widget_example.cc',
795 'examples/widget_example.h',
796 ],
797 'conditions': [
798 ['OS=="win"', {
799 'include_dirs': [
800 '../third_party/wtl/include',
801 ],
802 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
803 'msvs_disabled_warnings': [ 4267, ],
804 }],
805 ],
806 }, # target_name: views_examples_lib
807 {
808 'target_name': 'views_examples_exe',
809 'type': 'executable',
810 'dependencies': [
811 '../../base/base.gyp:base',
812 '../../base/base.gyp:base_i18n',
813 '../aura/aura.gyp:aura',
814 '../base/ui_base.gyp:ui_base',
815 '../compositor/compositor.gyp:compositor',
816 '../compositor/compositor.gyp:compositor_test_support',
817 '../gfx/gfx.gyp:gfx',
818 '../resources/ui_resources.gyp:ui_test_pak',
819 'views',
820 'views_examples_lib',
821 'views_test_support',
822 ],
823 'sources': [
824 'examples/examples_main.cc',
825 ],
826 }, # target_name: views_examples_exe
827 {
828 'target_name': 'views_examples_with_content_lib',
829 'type': '<(component)',
830 'dependencies': [
831 '../../base/base.gyp:base',
832 '../../base/base.gyp:base_i18n',
833 '../../content/content.gyp:content',
834 '../../skia/skia.gyp:skia',
835 '../../third_party/icu/icu.gyp:icui18n',
836 '../../third_party/icu/icu.gyp:icuuc',
837 '../../url/url.gyp:url_lib',
838 '../aura/aura.gyp:aura',
839 '../base/ui_base.gyp:ui_base',
840 '../events/events.gyp:events',
841 '../gfx/gfx.gyp:gfx',
842 '../gfx/gfx.gyp:gfx_geometry',
843 '../resources/ui_resources.gyp:ui_resources',
844 '../resources/ui_resources.gyp:ui_test_pak',
845 'controls/webview/webview.gyp:webview',
846 'views',
847 'views_examples_lib',
848 ],
849 'include_dirs': [
850 '..',
851 ],
852 'defines': [
853 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
854 ],
855 'sources': [
856 'examples/examples_window_with_content.cc',
857 'examples/examples_window_with_content.h',
858 'examples/views_examples_with_content_export.h',
859 'examples/webview_example.cc',
860 'examples/webview_example.h',
861 ],
862 'conditions': [
863 ['OS=="win"', {
864 'include_dirs': [
865 '../third_party/wtl/include',
866 ],
867 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
868 'msvs_disabled_warnings': [ 4267, ],
869 }],
870 ],
871 }, # target_name: views_examples_with_content_lib
872 {
873 'target_name': 'views_examples_with_content_exe',
874 'type': 'executable',
875 'dependencies': [
876 '../../base/base.gyp:base',
877 '../../base/base.gyp:base_i18n',
878 '../../content/content.gyp:content',
879 '../../content/content_shell_and_tests.gyp:content_shell_lib',
880 '../../content/content_shell_and_tests.gyp:test_support_content',
881 '../../skia/skia.gyp:skia',
882 '../../third_party/icu/icu.gyp:icui18n',
883 '../../third_party/icu/icu.gyp:icuuc',
884 '../aura/aura.gyp:aura',
885 '../base/ui_base.gyp:ui_base',
886 '../compositor/compositor.gyp:compositor',
887 '../events/events.gyp:events',
888 '../gfx/gfx.gyp:gfx',
889 '../gfx/gfx.gyp:gfx_geometry',
890 '../resources/ui_resources.gyp:ui_resources',
891 '../resources/ui_resources.gyp:ui_test_pak',
892 '../wm/wm.gyp:wm_test_support',
893 'views',
894 'views_examples_with_content_lib',
895 'views_test_support'
896 ],
897 'include_dirs': [
898 '../..',
899 ],
900 'sources': [
901 '../../content/app/startup_helper_win.cc',
902 'examples/content_client/examples_browser_main_parts.cc',
903 'examples/content_client/examples_browser_main_parts.h',
904 'examples/content_client/examples_content_browser_client.cc',
905 'examples/content_client/examples_content_browser_client.h',
906 'examples/content_client/examples_main_delegate.cc',
907 'examples/content_client/examples_main_delegate.h',
908 'examples/content_client/examples_main.cc',
909 ],
910 'conditions': [
911 ['OS=="win"', {
912 'link_settings': {
913 'libraries': [
914 '-limm32.lib',
915 '-loleacc.lib',
916 ]
917 },
918 'msvs_settings': {
919 'VCManifestTool': {
920 'AdditionalManifestFiles': [
921 'examples\\views_examples.exe.manifest',
922 ],
923 },
924 'VCLinkerTool': {
925 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
926 },
927 },
928 'dependencies': [
929 '../../sandbox/sandbox.gyp:sandbox',
930 ],
931 }],
932 ['OS=="win"', {
933 'sources/': [
934 # This is needed because the aura rule strips it from the default
935 # sources list.
936 ['include', '^../../content/app/startup_helper_win.cc'],
937 ],
938 }],
939 ],
940 }, # target_name: views_examples_with_content_exe
941 ], 694 ],
942 } 695 }
OLDNEW
« no previous file with comments | « ui/views/examples/examples.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698