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

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

Issue 132453002: Moves CandidateWindow model to ui/base/ime (2nd) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h" 11 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
12 #include "chromeos/ime/input_method_descriptor.h" 12 #include "chromeos/ime/input_method_descriptor.h"
13 #include "url/gurl.h" 13 #include "url/gurl.h"
14 14
15 namespace ui { 15 namespace ui {
16 class CandidateWindow;
16 class KeyEvent; 17 class KeyEvent;
17 } // namespace ui 18 } // namespace ui
18 19
19 namespace chromeos { 20 namespace chromeos {
20 21
21 class IBusText; 22 class IBusText;
22 23
23 namespace input_method { 24 namespace input_method {
24 class CandidateWindow;
25 struct InputMethodProperty; 25 struct InputMethodProperty;
26 struct KeyEventHandle; 26 struct KeyEventHandle;
27 } // namespace input_method 27 } // namespace input_method
28 28
29 class InputMethodEngine : public InputMethodEngineInterface { 29 class InputMethodEngine : public InputMethodEngineInterface {
30 public: 30 public:
31 InputMethodEngine(); 31 InputMethodEngine();
32 32
33 virtual ~InputMethodEngine(); 33 virtual ~InputMethodEngine();
34 34
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 std::string imm_id_; 121 std::string imm_id_;
122 122
123 // Pointer to the object recieving events for this IME. 123 // Pointer to the object recieving events for this IME.
124 InputMethodEngineInterface::Observer* observer_; 124 InputMethodEngineInterface::Observer* observer_;
125 125
126 // The current preedit text, and it's cursor position. 126 // The current preedit text, and it's cursor position.
127 scoped_ptr<IBusText> preedit_text_; 127 scoped_ptr<IBusText> preedit_text_;
128 int preedit_cursor_; 128 int preedit_cursor_;
129 129
130 // The current candidate window. 130 // The current candidate window.
131 scoped_ptr<input_method::CandidateWindow> candidate_window_; 131 scoped_ptr<ui::CandidateWindow> candidate_window_;
132 132
133 // The current candidate window property. 133 // The current candidate window property.
134 CandidateWindowProperty candidate_window_property_; 134 CandidateWindowProperty candidate_window_property_;
135 135
136 // Indicates whether the candidate window is visible. 136 // Indicates whether the candidate window is visible.
137 bool window_visible_; 137 bool window_visible_;
138 138
139 // Mapping of candidate index to candidate id. 139 // Mapping of candidate index to candidate id.
140 std::vector<int> candidate_ids_; 140 std::vector<int> candidate_ids_;
141 141
142 // Mapping of candidate id to index. 142 // Mapping of candidate id to index.
143 std::map<int, int> candidate_indexes_; 143 std::map<int, int> candidate_indexes_;
144 144
145 // Used for input view window. 145 // Used for input view window.
146 GURL input_view_url_; 146 GURL input_view_url_;
147 }; 147 };
148 148
149 } // namespace chromeos 149 } // namespace chromeos
150 150
151 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 151 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698