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

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

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 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>
(...skipping 13 matching lines...) Expand all
24 #include "ui/base/ime/chromeos/composition_text.h" 24 #include "ui/base/ime/chromeos/composition_text.h"
25 #include "ui/base/ime/chromeos/extension_ime_util.h" 25 #include "ui/base/ime/chromeos/extension_ime_util.h"
26 #include "ui/base/ime/chromeos/ime_keymap.h" 26 #include "ui/base/ime/chromeos/ime_keymap.h"
27 #include "ui/base/ime/chromeos/input_method_manager.h" 27 #include "ui/base/ime/chromeos/input_method_manager.h"
28 #include "ui/base/ime/text_input_flags.h" 28 #include "ui/base/ime/text_input_flags.h"
29 #include "ui/chromeos/ime/input_method_menu_item.h" 29 #include "ui/chromeos/ime/input_method_menu_item.h"
30 #include "ui/chromeos/ime/input_method_menu_manager.h" 30 #include "ui/chromeos/ime/input_method_menu_manager.h"
31 #include "ui/events/event.h" 31 #include "ui/events/event.h"
32 #include "ui/events/event_processor.h" 32 #include "ui/events/event_processor.h"
33 #include "ui/events/event_utils.h" 33 #include "ui/events/event_utils.h"
34 #include "ui/events/keycodes/dom3/dom_code.h" 34 #include "ui/events/keycodes/dom/dom_code.h"
35 #include "ui/events/keycodes/dom4/keycode_converter.h" 35 #include "ui/events/keycodes/dom/keycode_converter.h"
36 #include "ui/keyboard/keyboard_controller.h" 36 #include "ui/keyboard/keyboard_controller.h"
37 #include "ui/keyboard/keyboard_util.h" 37 #include "ui/keyboard/keyboard_util.h"
38 38
39 namespace chromeos { 39 namespace chromeos {
40 40
41 namespace { 41 namespace {
42 42
43 const char kErrorNotActive[] = "IME is not active"; 43 const char kErrorNotActive[] = "IME is not active";
44 const char kErrorWrongContext[] = "Context is not active"; 44 const char kErrorWrongContext[] = "Context is not active";
45 const char kCandidateNotFound[] = "Candidate not found"; 45 const char kCandidateNotFound[] = "Candidate not found";
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 // TODO(nona): Implement it. 678 // TODO(nona): Implement it.
679 break; 679 break;
680 } 680 }
681 } 681 }
682 } 682 }
683 683
684 // TODO(nona): Support item.children. 684 // TODO(nona): Support item.children.
685 } 685 }
686 686
687 } // namespace chromeos 687 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698