OLD | NEW |
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 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" |
6 | 6 |
7 #include <algorithm> // std::find | 7 #include <algorithm> // std::find |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 container.end(); | 42 container.end(); |
43 } | 43 } |
44 | 44 |
45 const struct MigrationInputMethodList { | 45 const struct MigrationInputMethodList { |
46 const char* old_input_method; | 46 const char* old_input_method; |
47 const char* new_input_method; | 47 const char* new_input_method; |
48 } kMigrationInputMethodList[] = { | 48 } kMigrationInputMethodList[] = { |
49 { "mozc", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us" }, | 49 { "mozc", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us" }, |
50 { "mozc-jp", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp" }, | 50 { "mozc-jp", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp" }, |
51 { "mozc-dv", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us" }, | 51 { "mozc-dv", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us" }, |
| 52 { "pinyin", "_comp_ime_nmblnjkfdkabgdofidlkienfnnbjhnabzh-t-i0-pinyin" }, |
| 53 { "pinyin-dv", "_comp_ime_nmblnjkfdkabgdofidlkienfnnbjhnabzh-t-i0-pinyin" }, |
| 54 { "mozc-chewing", |
| 55 "_comp_ime_ekbifjdfhkmdeeajnolmgdlmkllopefizh-hant-t-i0-und "}, |
| 56 { "m17n:zh:cangjie", |
| 57 "_comp_ime_gjhclobljhjhgoebiipblnmdodbmpdgdzh-hant-t-i0-cangjie-1987" }, |
52 }; | 58 }; |
53 | 59 |
54 } // namespace | 60 } // namespace |
55 | 61 |
56 InputMethodManagerImpl::InputMethodManagerImpl( | 62 InputMethodManagerImpl::InputMethodManagerImpl( |
57 scoped_ptr<InputMethodDelegate> delegate) | 63 scoped_ptr<InputMethodDelegate> delegate) |
58 : delegate_(delegate.Pass()), | 64 : delegate_(delegate.Pass()), |
59 state_(STATE_LOGIN_SCREEN), | 65 state_(STATE_LOGIN_SCREEN), |
60 util_(delegate_.get(), GetSupportedInputMethods()), | 66 util_(delegate_.get(), GetSupportedInputMethods()), |
61 component_extension_ime_manager_(new ComponentExtensionIMEManager()), | 67 component_extension_ime_manager_(new ComponentExtensionIMEManager()), |
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 else | 868 else |
863 DVLOG(1) << "Failed to initialize the candidate window controller"; | 869 DVLOG(1) << "Failed to initialize the candidate window controller"; |
864 } | 870 } |
865 | 871 |
866 bool InputMethodManagerImpl::IsIBusConnectionAlive() { | 872 bool InputMethodManagerImpl::IsIBusConnectionAlive() { |
867 return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient(); | 873 return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient(); |
868 } | 874 } |
869 | 875 |
870 } // namespace input_method | 876 } // namespace input_method |
871 } // namespace chromeos | 877 } // namespace chromeos |
OLD | NEW |