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

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

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 5 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
« no previous file with comments | « ui/views/view.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.h » ('j') | 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 # 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 'focus/focus_manager.h', 216 'focus/focus_manager.h',
217 'focus/focus_manager_delegate.h', 217 'focus/focus_manager_delegate.h',
218 'focus/focus_manager_factory.cc', 218 'focus/focus_manager_factory.cc',
219 'focus/focus_manager_factory.h', 219 'focus/focus_manager_factory.h',
220 'focus/focus_search.cc', 220 'focus/focus_search.cc',
221 'focus/focus_search.h', 221 'focus/focus_search.h',
222 'focus/view_storage.cc', 222 'focus/view_storage.cc',
223 'focus/view_storage.h', 223 'focus/view_storage.h',
224 'focus/widget_focus_manager.cc', 224 'focus/widget_focus_manager.cc',
225 'focus/widget_focus_manager.h', 225 'focus/widget_focus_manager.h',
226 'ime/input_method.h',
227 'ime/input_method_base.cc',
228 'ime/input_method_base.h',
229 'ime/input_method_bridge.cc',
230 'ime/input_method_bridge.h',
231 'ime/input_method_delegate.h',
232 'ime/mock_input_method.cc',
233 'ime/mock_input_method.h',
234 'ime/null_input_method.cc',
235 'ime/null_input_method.h',
236 'layout/box_layout.cc', 226 'layout/box_layout.cc',
237 'layout/box_layout.h', 227 'layout/box_layout.h',
238 'layout/fill_layout.cc', 228 'layout/fill_layout.cc',
239 'layout/fill_layout.h', 229 'layout/fill_layout.h',
240 'layout/grid_layout.cc', 230 'layout/grid_layout.cc',
241 'layout/grid_layout.h', 231 'layout/grid_layout.h',
242 'layout/layout_constants.h', 232 'layout/layout_constants.h',
243 'layout/layout_manager.cc', 233 'layout/layout_manager.cc',
244 'layout/layout_manager.h', 234 'layout/layout_manager.h',
245 'linux_ui/linux_ui.cc', 235 'linux_ui/linux_ui.cc',
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 'widget/native_widget_mac_unittest.mm', 559 'widget/native_widget_mac_unittest.mm',
570 'widget/native_widget_unittest.cc', 560 'widget/native_widget_unittest.cc',
571 'widget/root_view_unittest.cc', 561 'widget/root_view_unittest.cc',
572 'widget/widget_unittest.cc', 562 'widget/widget_unittest.cc',
573 'widget/window_reorderer_unittest.cc', 563 'widget/window_reorderer_unittest.cc',
574 'window/custom_frame_view_unittest.cc', 564 'window/custom_frame_view_unittest.cc',
575 'window/dialog_client_view_unittest.cc', 565 'window/dialog_client_view_unittest.cc',
576 'window/dialog_delegate_unittest.cc', 566 'window/dialog_delegate_unittest.cc',
577 ], 567 ],
578 'views_unittests_desktop_sources': [ 568 'views_unittests_desktop_sources': [
579 'ime/input_method_bridge_unittest.cc',
580 'widget/desktop_widget_unittest.cc', 569 'widget/desktop_widget_unittest.cc',
581 ], 570 ],
582 'views_unittests_aura_sources': [ 571 'views_unittests_aura_sources': [
583 'controls/native/native_view_host_aura_unittest.cc', 572 'controls/native/native_view_host_aura_unittest.cc',
584 'corewm/tooltip_controller_unittest.cc', 573 'corewm/tooltip_controller_unittest.cc',
585 'touchui/touch_selection_controller_impl_unittest.cc', 574 'touchui/touch_selection_controller_impl_unittest.cc',
586 'touchui/touch_selection_menu_runner_views_unittest.cc', 575 'touchui/touch_selection_menu_runner_views_unittest.cc',
587 'view_unittest_aura.cc', 576 'view_unittest_aura.cc',
588 'widget/native_widget_aura_unittest.cc', 577 'widget/native_widget_aura_unittest.cc',
589 ], 578 ],
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 ['use_x11==1', { 884 ['use_x11==1', {
896 'dependencies': [ 885 'dependencies': [
897 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' , 886 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' ,
898 ], 887 ],
899 }], 888 }],
900 ['OS=="mac"', { 889 ['OS=="mac"', {
901 # views_unittests not yet compiling on Mac. http://crbug.com/378134 890 # views_unittests not yet compiling on Mac. http://crbug.com/378134
902 'sources!': [ 891 'sources!': [
903 'bubble/bubble_window_targeter_unittest.cc', 892 'bubble/bubble_window_targeter_unittest.cc',
904 'controls/native/native_view_host_unittest.cc', 893 'controls/native/native_view_host_unittest.cc',
905 'ime/input_method_bridge_unittest.cc',
906 'widget/window_reorderer_unittest.cc', 894 'widget/window_reorderer_unittest.cc',
907 ] 895 ]
908 }], 896 }],
909 ], 897 ],
910 }, # target_name: views_unittests 898 }, # target_name: views_unittests
911 ], # targets 899 ], # targets
912 'conditions': [ 900 'conditions': [
913 ['OS=="mac"', { 901 ['OS=="mac"', {
914 'targets': [ 902 'targets': [
915 { 903 {
(...skipping 24 matching lines...) Expand all
940 '../aura/aura.gyp:aura', 928 '../aura/aura.gyp:aura',
941 '../wm/wm.gyp:wm', 929 '../wm/wm.gyp:wm',
942 ], 930 ],
943 }], 931 }],
944 ], 932 ],
945 }, # target_name: macviews_interactive_ui_tests 933 }, # target_name: macviews_interactive_ui_tests
946 ], # targets 934 ], # targets
947 }], 935 }],
948 ], # conditions 936 ], # conditions
949 } 937 }
OLDNEW
« no previous file with comments | « ui/views/view.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698