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

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: reverted changes for MockInputMethod. Created 5 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 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'widget/native_widget_mac_unittest.mm', 557 'widget/native_widget_mac_unittest.mm',
568 'widget/native_widget_unittest.cc', 558 'widget/native_widget_unittest.cc',
569 'widget/root_view_unittest.cc', 559 'widget/root_view_unittest.cc',
570 'widget/widget_unittest.cc', 560 'widget/widget_unittest.cc',
571 'widget/window_reorderer_unittest.cc', 561 'widget/window_reorderer_unittest.cc',
572 'window/custom_frame_view_unittest.cc', 562 'window/custom_frame_view_unittest.cc',
573 'window/dialog_client_view_unittest.cc', 563 'window/dialog_client_view_unittest.cc',
574 'window/dialog_delegate_unittest.cc', 564 'window/dialog_delegate_unittest.cc',
575 ], 565 ],
576 'views_unittests_desktop_sources': [ 566 'views_unittests_desktop_sources': [
577 'ime/input_method_bridge_unittest.cc',
578 'widget/desktop_widget_unittest.cc', 567 'widget/desktop_widget_unittest.cc',
579 ], 568 ],
580 'views_unittests_aura_sources': [ 569 'views_unittests_aura_sources': [
581 'controls/native/native_view_host_aura_unittest.cc', 570 'controls/native/native_view_host_aura_unittest.cc',
582 'corewm/tooltip_controller_unittest.cc', 571 'corewm/tooltip_controller_unittest.cc',
583 'touchui/touch_selection_controller_impl_unittest.cc', 572 'touchui/touch_selection_controller_impl_unittest.cc',
584 'touchui/touch_selection_menu_runner_views_unittest.cc', 573 'touchui/touch_selection_menu_runner_views_unittest.cc',
585 'view_unittest_aura.cc', 574 'view_unittest_aura.cc',
586 'widget/native_widget_aura_unittest.cc', 575 'widget/native_widget_aura_unittest.cc',
587 ], 576 ],
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 ], 876 ],
888 }], 877 }],
889 ['OS=="mac"', { 878 ['OS=="mac"', {
890 # views_unittests not yet compiling on Mac. http://crbug.com/378134 879 # views_unittests not yet compiling on Mac. http://crbug.com/378134
891 'sources!': [ 880 'sources!': [
892 'bubble/bubble_window_targeter_unittest.cc', 881 'bubble/bubble_window_targeter_unittest.cc',
893 'controls/button/custom_button_unittest.cc', 882 'controls/button/custom_button_unittest.cc',
894 'controls/menu/menu_controller_unittest.cc', 883 'controls/menu/menu_controller_unittest.cc',
895 'controls/native/native_view_host_unittest.cc', 884 'controls/native/native_view_host_unittest.cc',
896 'focus/focus_manager_unittest.cc', 885 'focus/focus_manager_unittest.cc',
897 'ime/input_method_bridge_unittest.cc',
898 'widget/window_reorderer_unittest.cc', 886 'widget/window_reorderer_unittest.cc',
899 ] 887 ]
900 }], 888 }],
901 ], 889 ],
902 }, # target_name: views_unittests 890 }, # target_name: views_unittests
903 ], # targets 891 ], # targets
904 'conditions': [ 892 'conditions': [
905 ['OS=="mac"', { 893 ['OS=="mac"', {
906 'targets': [ 894 'targets': [
907 { 895 {
(...skipping 24 matching lines...) Expand all
932 '../aura/aura.gyp:aura', 920 '../aura/aura.gyp:aura',
933 '../wm/wm.gyp:wm', 921 '../wm/wm.gyp:wm',
934 ], 922 ],
935 }], 923 }],
936 ], 924 ],
937 }, # target_name: macviews_interactive_ui_tests 925 }, # target_name: macviews_interactive_ui_tests
938 ], # targets 926 ], # targets
939 }], 927 }],
940 ], # conditions 928 ], # conditions
941 } 929 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698