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

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

Issue 2024953007: Make DesktopFactoryOzone instances to respect --ozone-platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make DesktopFactoryOzone instances to respect --ozone-platform Created 4 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
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 # Sources lists shared with GN build. 7 # Sources lists shared with GN build.
8 'views_sources': [ 8 'views_sources': [
9 'accessibility/native_view_accessibility.cc', 9 'accessibility/native_view_accessibility.cc',
10 'accessibility/native_view_accessibility.h', 10 'accessibility/native_view_accessibility.h',
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 'widget/desktop_aura/desktop_screen_win.h', 483 'widget/desktop_aura/desktop_screen_win.h',
484 'widget/desktop_aura/desktop_window_tree_host_win.cc', 484 'widget/desktop_aura/desktop_window_tree_host_win.cc',
485 'widget/desktop_aura/desktop_window_tree_host_win.h', 485 'widget/desktop_aura/desktop_window_tree_host_win.h',
486 ], 486 ],
487 'views_desktop_aura_ozone_sources': [ 487 'views_desktop_aura_ozone_sources': [
488 'widget/desktop_aura/desktop_factory_ozone.cc', 488 'widget/desktop_aura/desktop_factory_ozone.cc',
489 'widget/desktop_aura/desktop_factory_ozone.h', 489 'widget/desktop_aura/desktop_factory_ozone.h',
490 'widget/desktop_aura/desktop_screen_ozone.cc', 490 'widget/desktop_aura/desktop_screen_ozone.cc',
491 'widget/desktop_aura/desktop_window_tree_host_ozone.cc', 491 'widget/desktop_aura/desktop_window_tree_host_ozone.cc',
492 ], 492 ],
493 'views_desktop_aura_ozone_wayland_sources': [
494 'widget/desktop_aura/desktop_factory_ozone_wayland.cc',
495 'widget/desktop_aura/desktop_factory_ozone_wayland.h',
496 ],
493 'views_test_support_sources': [ 497 'views_test_support_sources': [
494 'animation/test/flood_fill_ink_drop_ripple_test_api.cc', 498 'animation/test/flood_fill_ink_drop_ripple_test_api.cc',
495 'animation/test/flood_fill_ink_drop_ripple_test_api.h', 499 'animation/test/flood_fill_ink_drop_ripple_test_api.h',
496 'animation/test/ink_drop_ripple_test_api.cc', 500 'animation/test/ink_drop_ripple_test_api.cc',
497 'animation/test/ink_drop_ripple_test_api.h', 501 'animation/test/ink_drop_ripple_test_api.h',
498 'animation/test/ink_drop_impl_test_api.cc', 502 'animation/test/ink_drop_impl_test_api.cc',
499 'animation/test/ink_drop_impl_test_api.h', 503 'animation/test/ink_drop_impl_test_api.h',
500 'animation/test/ink_drop_hover_test_api.cc', 504 'animation/test/ink_drop_hover_test_api.cc',
501 'animation/test/ink_drop_hover_test_api.h', 505 'animation/test/ink_drop_hover_test_api.h',
502 'animation/test/ink_drop_utils.cc', 506 'animation/test/ink_drop_utils.cc',
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 'sources': [ '<@(views_desktop_aura_x11_sources)' ], 804 'sources': [ '<@(views_desktop_aura_x11_sources)' ],
801 'dependencies': [ 805 'dependencies': [
802 '../../build/linux/system.gyp:xext', 806 '../../build/linux/system.gyp:xext',
803 '../../ui/base/x/ui_base_x.gyp:ui_base_x', 807 '../../ui/base/x/ui_base_x.gyp:ui_base_x',
804 ], 808 ],
805 }], 809 }],
806 ['OS == "win"', { 810 ['OS == "win"', {
807 'sources': [ '<@(views_desktop_aura_win_sources)' ], 811 'sources': [ '<@(views_desktop_aura_win_sources)' ],
808 }], 812 }],
809 ['use_ozone==1', { 813 ['use_ozone==1', {
810 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], 814 'sources': [
815 '<@(views_desktop_aura_ozone_sources)',
816 '<(desktop_factory_ozone_list_cc_file)',
817 ],
818
819 'conditions': [
820 ['ozone_platform_wayland == 1', {
821 'sources': [ '<@(views_desktop_aura_ozone_wayland_sources)' ],
822
823 }],
824 ],
825 'variables': {
826 'platform_list_txt_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/p latform_list.txt',
827 'desktop_factory_ozone_list_cc_file': '<(INTERMEDIATE_DIR)/ui/vi ews/desktop_factory_ozone_list.cc',
828 },
829 'actions': [
830 {
831 # GN version: //ui/views:generate_constructor_list
832 'action_name': 'generate_constructor_list',
833 'variables': {
834 'generator_path': '../ozone/generate_constructor_list.py',
835 },
836 'inputs': [
837 '<(generator_path)',
838 '<(platform_list_txt_file)',
839 ],
840 'outputs': [
841 '<(desktop_factory_ozone_list_cc_file)',
842 ],
843 'action': [
844 'python',
845 '<(generator_path)',
846 '--platform_list=<(platform_list_txt_file)',
joone 2016/06/06 22:37:58 How about passing '--platform=wayland' instead of
joone 2016/06/07 00:04:16 We had better create DesktopFactoryOzone(Headless|
847 '--output_cc=<(desktop_factory_ozone_list_cc_file)',
848 '--namespace=views',
849 '--typename=DesktopFactoryOzone',
850 '--include="ui/views/widget/desktop_aura/desktop_factory_ozo ne.h"',
851 ],
852 },
853 ],
811 }], 854 }],
812 ], 855 ],
813 }], 856 }],
814 ['OS=="mac"', { 857 ['OS=="mac"', {
815 'dependencies': [ 858 'dependencies': [
816 '../accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wi dget_mac', 859 '../accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wi dget_mac',
817 ], 860 ],
818 'link_settings': { 861 'link_settings': {
819 'libraries': [ 862 'libraries': [
820 # Required by bridged_native_widget.mm. 863 # Required by bridged_native_widget.mm.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 '../aura/aura.gyp:aura', 1082 '../aura/aura.gyp:aura',
1040 '../wm/wm.gyp:wm', 1083 '../wm/wm.gyp:wm',
1041 ], 1084 ],
1042 }], 1085 }],
1043 ], 1086 ],
1044 }, # target_name: macviews_interactive_ui_tests 1087 }, # target_name: macviews_interactive_ui_tests
1045 ], # targets 1088 ], # targets
1046 }], 1089 }],
1047 ], # conditions 1090 ], # conditions
1048 } 1091 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698