OLD | NEW |
---|---|
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 #ifndef UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ | 5 #ifndef UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ |
6 #define UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ | 6 #define UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "ui/base/ime/input_method_base.h" | 9 #include "ui/base/ime/input_method_base.h" |
10 #include "ui/base/ime/linux/linux_input_method_context.h" | 10 #include "ui/base/ime/linux/linux_input_method_context.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 // Overriden from ui::LinuxInputMethodContextDelegate | 41 // Overriden from ui::LinuxInputMethodContextDelegate |
42 virtual void OnCommit(const base::string16& text) OVERRIDE; | 42 virtual void OnCommit(const base::string16& text) OVERRIDE; |
43 virtual void OnPreeditChanged(const CompositionText& composition_text) | 43 virtual void OnPreeditChanged(const CompositionText& composition_text) |
44 OVERRIDE; | 44 OVERRIDE; |
45 virtual void OnPreeditEnd() OVERRIDE; | 45 virtual void OnPreeditEnd() OVERRIDE; |
46 virtual void OnPreeditStart() OVERRIDE; | 46 virtual void OnPreeditStart() OVERRIDE; |
47 | 47 |
48 protected: | 48 protected: |
49 // Overridden from InputMethodBase. | 49 // Overridden from InputMethodBase. |
50 virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, | 50 virtual void OnDidChangeFocusedClient(TextInputClient* focused_before, |
51 TextInputClient* focused) OVERRIDE; | 51 TextInputClient* focused); |
jamesr
2013/10/30 00:30:40
whoops, not intentional. i'll remove before landin
| |
52 | 52 |
53 private: | 53 private: |
54 scoped_ptr<LinuxInputMethodContext> input_method_context_; | 54 scoped_ptr<LinuxInputMethodContext> input_method_context_; |
55 | 55 |
56 DISALLOW_COPY_AND_ASSIGN(InputMethodLinuxX11); | 56 DISALLOW_COPY_AND_ASSIGN(InputMethodLinuxX11); |
57 }; | 57 }; |
58 | 58 |
59 } // namespace ui | 59 } // namespace ui |
60 | 60 |
61 #endif // UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ | 61 #endif // UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_ |
OLD | NEW |