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

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

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month 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 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 }], 659 }],
660 ['use_ozone==1', { 660 ['use_ozone==1', {
661 'dependencies': [ 661 'dependencies': [
662 '../ozone/ozone.gyp:ozone', 662 '../ozone/ozone.gyp:ozone',
663 ], 663 ],
664 }], 664 }],
665 ['use_x11==1', { 665 ['use_x11==1', {
666 'dependencies': [ 666 'dependencies': [
667 '../../build/linux/system.gyp:x11', 667 '../../build/linux/system.gyp:x11',
668 '../../build/linux/system.gyp:xrandr', 668 '../../build/linux/system.gyp:xrandr',
669 '../events/devices/events_devices.gyp:events_devices',
669 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' , 670 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' ,
670 ], 671 ],
671 }], 672 }],
672 ['use_aura==1', { 673 ['use_aura==1', {
673 'sources': [ 674 'sources': [
674 '<@(views_aura_sources)', 675 '<@(views_aura_sources)',
675 ], 676 ],
676 'dependencies': [ 677 'dependencies': [
677 '../aura/aura.gyp:aura', 678 '../aura/aura.gyp:aura',
678 '../wm/wm.gyp:wm', 679 '../wm/wm.gyp:wm',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 ['OS=="linux" and use_allocator!="none"', { 807 ['OS=="linux" and use_allocator!="none"', {
807 # See http://crbug.com/162998#c4 for why this is needed. 808 # See http://crbug.com/162998#c4 for why this is needed.
808 'dependencies': [ 809 'dependencies': [
809 '../../base/allocator/allocator.gyp:allocator', 810 '../../base/allocator/allocator.gyp:allocator',
810 ], 811 ],
811 }], 812 }],
812 ['use_x11==1', { 813 ['use_x11==1', {
813 'dependencies': [ 814 'dependencies': [
814 '../../build/linux/system.gyp:x11', 815 '../../build/linux/system.gyp:x11',
815 '../../build/linux/system.gyp:xext', 816 '../../build/linux/system.gyp:xext',
817 '../events/devices/events_devices.gyp:events_devices',
816 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' , 818 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' ,
817 ], 819 ],
818 }], 820 }],
819 ['use_ozone==1', { 821 ['use_ozone==1', {
820 'sources!': [ 822 'sources!': [
821 'corewm/capture_controller_unittest.cc', 823 'corewm/capture_controller_unittest.cc',
822 ], 824 ],
823 }], 825 }],
824 ['use_aura==1', { 826 ['use_aura==1', {
825 'sources': [ '<@(views_unittests_aura_sources)' ], 827 'sources': [ '<@(views_unittests_aura_sources)' ],
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 '../aura/aura.gyp:aura', 885 '../aura/aura.gyp:aura',
884 '../wm/wm.gyp:wm', 886 '../wm/wm.gyp:wm',
885 ], 887 ],
886 }], 888 }],
887 ], 889 ],
888 }, # target_name: macviews_interactive_ui_tests 890 }, # target_name: macviews_interactive_ui_tests
889 ], # targets 891 ], # targets
890 }], 892 }],
891 ], # conditions 893 ], # conditions
892 } 894 }
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698