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

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

Issue 442403004: Fix the issue that 3rd party IME cannot be activated after user login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // |current_input_method_|, and |active_input_method_ids_| above are copied 178 // |current_input_method_|, and |active_input_method_ids_| above are copied
179 // to these "saved" variables. 179 // to these "saved" variables.
180 InputMethodDescriptor saved_previous_input_method_; 180 InputMethodDescriptor saved_previous_input_method_;
181 InputMethodDescriptor saved_current_input_method_; 181 InputMethodDescriptor saved_current_input_method_;
182 std::vector<std::string> saved_active_input_method_ids_; 182 std::vector<std::string> saved_active_input_method_ids_;
183 183
184 // Extra input methods that have been explicitly added to the menu, such as 184 // Extra input methods that have been explicitly added to the menu, such as
185 // those created by extension. 185 // those created by extension.
186 std::map<std::string, InputMethodDescriptor> extra_input_methods_; 186 std::map<std::string, InputMethodDescriptor> extra_input_methods_;
187 187
188 // The pending input method id for delayed 3rd party IME enabling.
189 std::string pending_input_method_id_;
190
188 // The candidate window. This will be deleted when the APP_TERMINATING 191 // The candidate window. This will be deleted when the APP_TERMINATING
189 // message is sent. 192 // message is sent.
190 scoped_ptr<CandidateWindowController> candidate_window_controller_; 193 scoped_ptr<CandidateWindowController> candidate_window_controller_;
191 194
192 // An object which provides miscellaneous input method utility functions. Note 195 // An object which provides miscellaneous input method utility functions. Note
193 // that |util_| is required to initialize |keyboard_|. 196 // that |util_| is required to initialize |keyboard_|.
194 InputMethodUtil util_; 197 InputMethodUtil util_;
195 198
196 // An object which provides component extension ime management functions. 199 // An object which provides component extension ime management functions.
197 scoped_ptr<ComponentExtensionIMEManager> component_extension_ime_manager_; 200 scoped_ptr<ComponentExtensionIMEManager> component_extension_ime_manager_;
198 201
199 // An object for switching XKB layouts and keyboard status like caps lock and 202 // An object for switching XKB layouts and keyboard status like caps lock and
200 // auto-repeat interval. 203 // auto-repeat interval.
201 scoped_ptr<ImeKeyboard> keyboard_; 204 scoped_ptr<ImeKeyboard> keyboard_;
202 205
203 base::ThreadChecker thread_checker_; 206 base::ThreadChecker thread_checker_;
204 207
205 base::WeakPtrFactory<InputMethodManagerImpl> weak_ptr_factory_; 208 base::WeakPtrFactory<InputMethodManagerImpl> weak_ptr_factory_;
206 209
207 // The engine map from extension_id to an engine. 210 // The engine map from extension_id to an engine.
208 std::map<std::string, InputMethodEngineInterface*> engine_map_; 211 std::map<std::string, InputMethodEngineInterface*> engine_map_;
209 212
210 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 213 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
211 }; 214 };
212 215
213 } // namespace input_method 216 } // namespace input_method
214 } // namespace chromeos 217 } // namespace chromeos
215 218
216 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 219 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698