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

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

Issue 693733002: Adds ozone support for ime keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | chromeos/BUILD.gn » ('j') | chromeos/ime/ime_keyboard.h » ('J')
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>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 15 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
16 #include "chrome/browser/chromeos/input_method/input_method_util.h" 16 #include "chrome/browser/chromeos/input_method/input_method_util.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chromeos/ime/input_method_manager.h" 18 #include "chromeos/ime/input_method_manager.h"
19 #include "chromeos/ime/input_method_whitelist.h" 19 #include "chromeos/ime/input_method_whitelist.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 class ComponentExtensionIMEManager; 22 class ComponentExtensionIMEManager;
23 class ComponentExtensionIMEManagerDelegate; 23 class ComponentExtensionIMEManagerDelegate;
24 class InputMethodEngine; 24 class InputMethodEngine;
25 namespace input_method { 25 namespace input_method {
26 class InputMethodDelegate; 26 class InputMethodDelegate;
27 class ImeKeyboard; 27 class ImeKeyboard;
28 class ImeKeyboardX11;
Shu Chen 2014/11/04 06:17:08 why add this?
FengYuan 2014/11/04 07:11:19 removed.
28 29
29 // The implementation of InputMethodManager. 30 // The implementation of InputMethodManager.
30 class InputMethodManagerImpl : public InputMethodManager, 31 class InputMethodManagerImpl : public InputMethodManager,
31 public CandidateWindowController::Observer { 32 public CandidateWindowController::Observer {
32 public: 33 public:
33 class StateImpl : public InputMethodManager::State { 34 class StateImpl : public InputMethodManager::State {
34 public: 35 public:
35 StateImpl(InputMethodManagerImpl* manager, Profile* profile); 36 StateImpl(InputMethodManagerImpl* manager, Profile* profile);
36 37
37 // Init new state as a copy of other. 38 // Init new state as a copy of other.
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // Chinese Pinyin IME. Note "zh-hant-t-i0-pinyin" < "zh-t-i0-pinyin". 270 // Chinese Pinyin IME. Note "zh-hant-t-i0-pinyin" < "zh-t-i0-pinyin".
270 std::map<std::string, int> stat_id_map_; 271 std::map<std::string, int> stat_id_map_;
271 272
272 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 273 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
273 }; 274 };
274 275
275 } // namespace input_method 276 } // namespace input_method
276 } // namespace chromeos 277 } // namespace chromeos
277 278
278 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 279 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chromeos/BUILD.gn » ('j') | chromeos/ime/ime_keyboard.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698