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

Side by Side Diff: views/views.gyp

Issue 6688049: New InputMethod api for Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't dispatch the character when focus was changed by the key event. Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « views/view.cc ('k') | views/widget/widget.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'conditions': [ 10 'conditions': [
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ['exclude', '\\.mm?$'], 42 ['exclude', '\\.mm?$'],
43 ], 43 ],
44 }], 44 }],
45 ['OS=="win"', {'sources/': [ 45 ['OS=="win"', {'sources/': [
46 ['include', '_(win)\\.cc$'], 46 ['include', '_(win)\\.cc$'],
47 ['include', '/win/'], 47 ['include', '/win/'],
48 ['include', '/win_[^/]*\\.cc$'], 48 ['include', '/win_[^/]*\\.cc$'],
49 ]}], 49 ]}],
50 ['touchui==0', {'sources/': [ 50 ['touchui==0', {'sources/': [
51 ['exclude', 'events/event_x.cc$'], 51 ['exclude', 'events/event_x.cc$'],
52 ['exclude', 'ime/'],
53 ['exclude', 'native_menu_x.cc$'], 52 ['exclude', 'native_menu_x.cc$'],
54 ['exclude', 'native_menu_x.h$'], 53 ['exclude', 'native_menu_x.h$'],
55 ['exclude', 'touchui/'], 54 ['exclude', 'touchui/'],
56 ['exclude', '_(touch)\\.cc$'], 55 ['exclude', '_(touch)\\.cc$'],
57 ]}], 56 ]}],
58 ], 57 ],
59 }, 58 },
60 'targets': [ 59 'targets': [
61 { 60 {
62 'target_name': 'views', 61 'target_name': 'views',
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 'focus/focus_manager.h', 278 'focus/focus_manager.h',
280 'focus/focus_search.cc', 279 'focus/focus_search.cc',
281 'focus/focus_search.h', 280 'focus/focus_search.h',
282 'focus/focus_util_win.cc', 281 'focus/focus_util_win.cc',
283 'focus/focus_util_win.h', 282 'focus/focus_util_win.h',
284 'focus/view_storage.cc', 283 'focus/view_storage.cc',
285 'focus/view_storage.h', 284 'focus/view_storage.h',
286 'ime/ibus_ime_context.cc', 285 'ime/ibus_ime_context.cc',
287 'ime/ime_context.cc', 286 'ime/ime_context.cc',
288 'ime/ime_context.h', 287 'ime/ime_context.h',
288 'ime/input_method.h',
289 'ime/input_method_delegate.h',
290 'ime/input_method_base.cc',
291 'ime/input_method_base.h',
292 'ime/input_method_gtk.cc',
293 'ime/input_method_gtk.h',
294 'ime/input_method_win.cc',
295 'ime/input_method_win.h',
296 'ime/text_input_client.h',
289 'layout/box_layout.cc', 297 'layout/box_layout.cc',
290 'layout/box_layout.h', 298 'layout/box_layout.h',
291 'layout/fill_layout.cc', 299 'layout/fill_layout.cc',
292 'layout/fill_layout.h', 300 'layout/fill_layout.h',
293 'layout/grid_layout.cc', 301 'layout/grid_layout.cc',
294 'layout/grid_layout.h', 302 'layout/grid_layout.h',
295 'layout/layout_constants.h', 303 'layout/layout_constants.h',
296 'layout/layout_manager.cc', 304 'layout/layout_manager.cc',
297 'layout/layout_manager.h', 305 'layout/layout_manager.h',
298 'metrics.cc', 306 'metrics.cc',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 ['exclude', 'touchui/touch_factory.h'], 443 ['exclude', 'touchui/touch_factory.h'],
436 ], 444 ],
437 }], 445 }],
438 ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"! =""', { 446 ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"! =""', {
439 'sources/': [ 447 'sources/': [
440 ['exclude', 'ime/ibus_ime_context.cc'], 448 ['exclude', 'ime/ibus_ime_context.cc'],
441 ], 449 ],
442 'defines': ['USE_DUMMY_IME_CONTEXT'], 450 'defines': ['USE_DUMMY_IME_CONTEXT'],
443 }], 451 }],
444 ], 452 ],
453 }, { # else: touchui != 1
454 'sources!': [
455 'ime/ibus_ime_context.cc',
456 'ime/ime_context.cc',
457 'ime/ime_context.h',
458 ],
445 }], 459 }],
446 ['OS=="win"', { 460 ['OS=="win"', {
447 'sources!': [ 461 'sources!': [
448 'controls/slider/slider.cc', 462 'controls/slider/slider.cc',
449 'controls/slider/slider.h', 463 'controls/slider/slider.h',
450 'controls/slider/native_slider_wrapper.h', 464 'controls/slider/native_slider_wrapper.h',
451 ], 465 ],
452 'include_dirs': [ 466 'include_dirs': [
453 '<(DEPTH)/third_party/wtl/include', 467 '<(DEPTH)/third_party/wtl/include',
454 ], 468 ],
(...skipping 23 matching lines...) Expand all
478 'controls/label_unittest.cc', 492 'controls/label_unittest.cc',
479 'controls/progress_bar_unittest.cc', 493 'controls/progress_bar_unittest.cc',
480 'controls/single_split_view_unittest.cc', 494 'controls/single_split_view_unittest.cc',
481 'controls/tabbed_pane/tabbed_pane_unittest.cc', 495 'controls/tabbed_pane/tabbed_pane_unittest.cc',
482 'controls/table/table_view_unittest.cc', 496 'controls/table/table_view_unittest.cc',
483 'controls/textfield/native_textfield_views_unittest.cc', 497 'controls/textfield/native_textfield_views_unittest.cc',
484 'controls/textfield/textfield_views_model_unittest.cc', 498 'controls/textfield/textfield_views_model_unittest.cc',
485 'events/event_unittest.cc', 499 'events/event_unittest.cc',
486 'focus/accelerator_handler_gtk_unittest.cc', 500 'focus/accelerator_handler_gtk_unittest.cc',
487 'focus/focus_manager_unittest.cc', 501 'focus/focus_manager_unittest.cc',
502 'ime/mock_input_method.cc',
503 'ime/mock_input_method.h',
488 'layout/grid_layout_unittest.cc', 504 'layout/grid_layout_unittest.cc',
489 'layout/box_layout_unittest.cc', 505 'layout/box_layout_unittest.cc',
490 'test/views_test_base.cc', 506 'test/views_test_base.cc',
491 'test/views_test_base.h', 507 'test/views_test_base.h',
492 'run_all_unittests.cc', 508 'run_all_unittests.cc',
493 'test/test_views_delegate.cc', 509 'test/test_views_delegate.cc',
494 'test/test_views_delegate.h', 510 'test/test_views_delegate.h',
495 'view_unittest.cc', 511 'view_unittest.cc',
496 'widget/native_widget_test_utils.h', 512 'widget/native_widget_test_utils.h',
497 'widget/native_widget_test_utils_gtk.cc', 513 'widget/native_widget_test_utils_gtk.cc',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 ], 628 ],
613 }, 629 },
614 ], 630 ],
615 } 631 }
616 632
617 # Local Variables: 633 # Local Variables:
618 # tab-width:2 634 # tab-width:2
619 # indent-tabs-mode:nil 635 # indent-tabs-mode:nil
620 # End: 636 # End:
621 # vim: set expandtab tabstop=2 shiftwidth=2: 637 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « views/view.cc ('k') | views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698