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: chrome/browser/chromeos/input_method/input_method_engine.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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
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 #define XK_MISCELLANY 7 #define XK_MISCELLANY
8 #include <X11/keysymdef.h> 8 #include <X11/keysymdef.h>
9 #include <X11/X.h> 9 #include <X11/X.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
11 #include <X11/Xutil.h> 11 #include <X11/Xutil.h>
12 #undef FocusIn 12 #undef FocusIn
13 #undef FocusOut 13 #undef FocusOut
14 #undef RootWindow 14 #undef RootWindow
15 #include <map> 15 #include <map>
16 16
17 #include "ash/ime/input_method_menu_item.h" 17 #include "ash/ime/input_method_menu_item.h"
18 #include "ash/ime/input_method_menu_manager.h" 18 #include "ash/ime/input_method_menu_manager.h"
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #include "base/logging.h" 20 #include "base/logging.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
24 #include "base/strings/utf_string_conversions.h" 24 #include "base/strings/utf_string_conversions.h"
25 #include "chromeos/ime/component_extension_ime_manager.h" 25 #include "chromeos/ime/component_extension_ime_manager.h"
26 #include "chromeos/ime/composition_text.h" 26 #include "chromeos/ime/composition_text.h"
27 #include "chromeos/ime/extension_ime_util.h" 27 #include "chromeos/ime/extension_ime_util.h"
28 #include "chromeos/ime/ibus_keymap.h" 28 #include "chromeos/ime/ibus_keymap.h"
29 #include "chromeos/ime/input_method_manager.h" 29 #include "chromeos/ime/input_method_manager.h"
30 #include "ui/aura/root_window.h"
31 #include "ui/aura/window.h" 30 #include "ui/aura/window.h"
31 #include "ui/aura/window_event_dispatcher.h"
32 #include "ui/base/ime/candidate_window.h" 32 #include "ui/base/ime/candidate_window.h"
33 #include "ui/events/event.h" 33 #include "ui/events/event.h"
34 #include "ui/events/keycodes/dom4/keycode_converter.h" 34 #include "ui/events/keycodes/dom4/keycode_converter.h"
35 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 35 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
36 #include "ui/keyboard/keyboard_controller.h" 36 #include "ui/keyboard/keyboard_controller.h"
37 37
38 namespace chromeos { 38 namespace chromeos {
39 const char* kErrorNotActive = "IME is not active"; 39 const char* kErrorNotActive = "IME is not active";
40 const char* kErrorWrongContext = "Context is not active"; 40 const char* kErrorWrongContext = "Context is not active";
41 const char* kCandidateNotFound = "Candidate not found"; 41 const char* kCandidateNotFound = "Candidate not found";
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 // TODO(nona): Implement it. 631 // TODO(nona): Implement it.
632 break; 632 break;
633 } 633 }
634 } 634 }
635 } 635 }
636 636
637 // TODO(nona): Support item.children. 637 // TODO(nona): Support item.children.
638 } 638 }
639 639
640 } // namespace chromeos 640 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698