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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine.cc

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chrome/browser/chromeos/input_method/input_method_engine.h" 5 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
6 6
7 #undef FocusIn 7 #undef FocusIn
8 #undef FocusOut 8 #undef FocusOut
9 #undef RootWindow 9 #undef RootWindow
10 #include <map> 10 #include <map>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "chromeos/ime/component_extension_ime_manager.h"
20 #include "chromeos/ime/composition_text.h"
21 #include "chromeos/ime/extension_ime_util.h"
22 #include "chromeos/ime/input_method_manager.h"
23 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
24 #include "ui/aura/window_tree_host.h" 20 #include "ui/aura/window_tree_host.h"
25 #include "ui/base/ime/candidate_window.h" 21 #include "ui/base/ime/candidate_window.h"
22 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
23 #include "ui/base/ime/chromeos/composition_text.h"
24 #include "ui/base/ime/chromeos/extension_ime_util.h"
26 #include "ui/base/ime/chromeos/ime_keymap.h" 25 #include "ui/base/ime/chromeos/ime_keymap.h"
26 #include "ui/base/ime/chromeos/input_method_manager.h"
27 #include "ui/base/ime/text_input_flags.h" 27 #include "ui/base/ime/text_input_flags.h"
28 #include "ui/chromeos/ime/input_method_menu_item.h" 28 #include "ui/chromeos/ime/input_method_menu_item.h"
29 #include "ui/chromeos/ime/input_method_menu_manager.h" 29 #include "ui/chromeos/ime/input_method_menu_manager.h"
30 #include "ui/events/event.h" 30 #include "ui/events/event.h"
31 #include "ui/events/event_processor.h" 31 #include "ui/events/event_processor.h"
32 #include "ui/events/keycodes/dom4/keycode_converter.h" 32 #include "ui/events/keycodes/dom4/keycode_converter.h"
33 #include "ui/keyboard/keyboard_controller.h" 33 #include "ui/keyboard/keyboard_controller.h"
34 #include "ui/keyboard/keyboard_util.h" 34 #include "ui/keyboard/keyboard_util.h"
35 35
36 #if defined(USE_ATHENA) 36 #if defined(USE_ATHENA)
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 // TODO(nona): Implement it. 698 // TODO(nona): Implement it.
699 break; 699 break;
700 } 700 }
701 } 701 }
702 } 702 }
703 703
704 // TODO(nona): Support item.children. 704 // TODO(nona): Support item.children.
705 } 705 }
706 706
707 } // namespace chromeos 707 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698