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

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

Issue 927233003: MacViews: Fix positioning of top-level Widgets with parents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: Added comment to BridgedNativeWidget Created 5 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
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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'controls/table/table_utils_unittest.cc', 541 'controls/table/table_utils_unittest.cc',
542 'controls/table/table_view_unittest.cc', 542 'controls/table/table_view_unittest.cc',
543 'controls/table/test_table_model.cc', 543 'controls/table/test_table_model.cc',
544 'controls/table/test_table_model.h', 544 'controls/table/test_table_model.h',
545 'controls/textfield/textfield_model_unittest.cc', 545 'controls/textfield/textfield_model_unittest.cc',
546 'controls/textfield/textfield_unittest.cc', 546 'controls/textfield/textfield_unittest.cc',
547 'controls/tree/tree_view_unittest.cc', 547 'controls/tree/tree_view_unittest.cc',
548 'event_monitor_unittest.cc', 548 'event_monitor_unittest.cc',
549 'focus/focus_manager_unittest.cc', 549 'focus/focus_manager_unittest.cc',
550 'focus/focus_traversal_unittest.cc', 550 'focus/focus_traversal_unittest.cc',
551 'ime/input_method_bridge_unittest.cc',
552 'layout/box_layout_unittest.cc', 551 'layout/box_layout_unittest.cc',
553 'layout/grid_layout_unittest.cc', 552 'layout/grid_layout_unittest.cc',
554 'rect_based_targeting_utils_unittest.cc', 553 'rect_based_targeting_utils_unittest.cc',
555 'run_all_unittests.cc', 554 'run_all_unittests.cc',
556 'view_model_unittest.cc', 555 'view_model_unittest.cc',
557 'view_model_utils_unittest.cc', 556 'view_model_utils_unittest.cc',
558 'view_targeter_unittest.cc', 557 'view_targeter_unittest.cc',
559 'view_unittest.cc', 558 'view_unittest.cc',
560 'view_unittest_aura.cc', 559 'view_unittest_aura.cc',
561 'widget/native_widget_aura_unittest.cc', 560 'widget/native_widget_aura_unittest.cc',
562 'widget/native_widget_mac_unittest.mm', 561 'widget/native_widget_mac_unittest.mm',
563 'widget/native_widget_unittest.cc', 562 'widget/native_widget_unittest.cc',
564 'widget/root_view_unittest.cc', 563 'widget/root_view_unittest.cc',
565 'widget/widget_unittest.cc', 564 'widget/widget_unittest.cc',
566 'widget/window_reorderer_unittest.cc', 565 'widget/window_reorderer_unittest.cc',
567 'window/custom_frame_view_unittest.cc', 566 'window/custom_frame_view_unittest.cc',
568 'window/dialog_client_view_unittest.cc', 567 'window/dialog_client_view_unittest.cc',
569 'window/dialog_delegate_unittest.cc', 568 'window/dialog_delegate_unittest.cc',
570 ], 569 ],
570 'views_unittests_desktop_sources': [
571 'ime/input_method_bridge_unittest.cc',
572 'widget/desktop_widget_unittest.cc',
573 ],
571 'views_unittests_aura_sources': [ 574 'views_unittests_aura_sources': [
572 'corewm/tooltip_aura_unittest.cc', 575 'corewm/tooltip_aura_unittest.cc',
573 'corewm/tooltip_controller_unittest.cc', 576 'corewm/tooltip_controller_unittest.cc',
574 'touchui/touch_selection_controller_impl_unittest.cc', 577 'touchui/touch_selection_controller_impl_unittest.cc',
575 ], 578 ],
576 'views_unittests_desktop_aura_sources': [ 579 'views_unittests_desktop_aura_sources': [
577 'widget/desktop_aura/desktop_focus_rules_unittest.cc', 580 'widget/desktop_aura/desktop_focus_rules_unittest.cc',
578 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', 581 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
579 'widget/desktop_aura/desktop_screen_position_client_unittest.cc',
580 ], 582 ],
581 'views_unittests_desktop_aurax11_sources': [ 583 'views_unittests_desktop_aurax11_sources': [
582 'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc', 584 'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc',
583 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 585 'widget/desktop_aura/desktop_screen_x11_unittest.cc',
584 'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc', 586 'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc',
585 ], 587 ],
586 }, 588 },
587 'targets': [ 589 'targets': [
588 { 590 {
589 # GN version: //ui/views 591 # GN version: //ui/views
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 'views', 795 'views',
794 'views_test_support', 796 'views_test_support',
795 ], 797 ],
796 'include_dirs': [ 798 'include_dirs': [
797 '..', 799 '..',
798 ], 800 ],
799 'sources': [ 801 'sources': [
800 '<@(views_unittests_sources)', 802 '<@(views_unittests_sources)',
801 ], 803 ],
802 'conditions': [ 804 'conditions': [
803 ['chromeos==1', {
804 'sources!': [
805 'ime/input_method_bridge_unittest.cc',
806 ],
807 }],
808 ['OS=="win"', { 805 ['OS=="win"', {
809 'dependencies': [ 806 'dependencies': [
810 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 807 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
811 ], 808 ],
812 'link_settings': { 809 'link_settings': {
813 'libraries': [ 810 'libraries': [
814 '-limm32.lib', 811 '-limm32.lib',
815 '-loleacc.lib', 812 '-loleacc.lib',
816 '-lcomctl32.lib', 813 '-lcomctl32.lib',
817 ] 814 ]
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 ], 852 ],
856 'conditions': [ 853 'conditions': [
857 ['chromeos == 0', { 854 ['chromeos == 0', {
858 'sources': [ '<@(views_unittests_desktop_aura_sources)' ], 855 'sources': [ '<@(views_unittests_desktop_aura_sources)' ],
859 }], 856 }],
860 ['chromeos == 0 and use_x11==1', { 857 ['chromeos == 0 and use_x11==1', {
861 'sources': [ '<@(views_unittests_desktop_aurax11_sources)' ], 858 'sources': [ '<@(views_unittests_desktop_aurax11_sources)' ],
862 }], 859 }],
863 ] 860 ]
864 }], 861 }],
862 ['chromeos==0', {
863 'sources': [ '<@(views_unittests_desktop_sources)' ],
864 }],
865 ['use_x11==1', { 865 ['use_x11==1', {
866 'dependencies': [ 866 'dependencies': [
867 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' , 867 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' ,
868 ], 868 ],
869 }], 869 }],
870 ['OS=="mac"', { 870 ['OS=="mac"', {
871 # views_unittests not yet compiling on Mac. http://crbug.com/378134 871 # views_unittests not yet compiling on Mac. http://crbug.com/378134
872 'sources!': [ 872 'sources!': [
873 'bubble/bubble_window_targeter_unittest.cc', 873 'bubble/bubble_window_targeter_unittest.cc',
874 'controls/button/custom_button_unittest.cc', 874 'controls/button/custom_button_unittest.cc',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 '../aura/aura.gyp:aura', 912 '../aura/aura.gyp:aura',
913 '../wm/wm.gyp:wm', 913 '../wm/wm.gyp:wm',
914 ], 914 ],
915 }], 915 }],
916 ], 916 ],
917 }, # target_name: macviews_interactive_ui_tests 917 }, # target_name: macviews_interactive_ui_tests
918 ], # targets 918 ], # targets
919 }], 919 }],
920 ], # conditions 920 ], # conditions
921 } 921 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698