Chromium Code Reviews| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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" }, | 52 { "pinyin", "_comp_ime_nmblnjkfdkabgdofidlkienfnnbjhnabzh-t-i0-pinyin" }, |
| 53 { "pinyin-dv", "_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", | 54 { "m17n:zh:cangjie", |
| 57 "_comp_ime_gjhclobljhjhgoebiipblnmdodbmpdgdzh-hant-t-i0-cangjie-1987" }, | 55 "_comp_ime_gjhclobljhjhgoebiipblnmdodbmpdgdzh-hant-t-i0-cangjie-1987" }, |
| 58 // TODO(nona): Remove following migration map in M31. | 56 // TODO(nona): Remove following migration map in M31. |
| 59 { "m17n:ta:itrans", | 57 { "m17n:ta:itrans", |
| 60 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_itrans" }, | 58 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_itrans" }, |
| 61 { "m17n:ta:tamil99", | 59 { "m17n:ta:tamil99", |
| 62 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_tamil99" }, | 60 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_tamil99" }, |
| 63 { "m17n:ta:typewriter", | 61 { "m17n:ta:typewriter", |
| 64 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_typewriter" }, | 62 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ta_typewriter" }, |
| 65 { "m17n:ta:inscript", | 63 { "m17n:ta:inscript", |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 88 { "m17n:kn:itrans", | 86 { "m17n:kn:itrans", |
| 89 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_kn_phone" }, | 87 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_kn_phone" }, |
| 90 { "m17n:ml:itrans", | 88 { "m17n:ml:itrans", |
| 91 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ml_phone" }, | 89 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ml_phone" }, |
| 92 { "m17n:mr:itrans", | 90 { "m17n:mr:itrans", |
| 93 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_deva_phone" }, | 91 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_deva_phone" }, |
| 94 { "m17n:te:itrans", | 92 { "m17n:te:itrans", |
| 95 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_te_phone" }, | 93 "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_te_phone" }, |
| 96 { "m17n:fa:isiri", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_fa" }, | 94 { "m17n:fa:isiri", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_fa" }, |
| 97 { "m17n:ar:kbd", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ar" }, | 95 { "m17n:ar:kbd", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_ar" }, |
| 98 // TODO(nona): Remove following migration map in M32 | |
| 99 { "m17n:zh:quick", | |
| 100 "_comp_ime_ekbifjdfhkmdeeajnolmgdlmkllopefizh-hant-t-i0-und" }, | |
|
zhangchi
2013/08/01 03:35:54
We have nothing to do about quick.
Seigo Nonaka
2013/08/01 17:26:09
Zhuyin and Quick is in same extension packages.
On
| |
| 101 }; | 96 }; |
| 102 | 97 |
| 103 const struct MigrationHangulKeyboardToInputMethodID { | 98 const struct MigrationHangulKeyboardToInputMethodID { |
| 104 const char* keyboard_id; | 99 const char* keyboard_id; |
| 105 const char* ime_id; | 100 const char* ime_id; |
| 106 } kMigrationHangulKeyboardToInputMethodID[] = { | 101 } kMigrationHangulKeyboardToInputMethodID[] = { |
| 107 { "2", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_2set" }, | 102 { "2", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_2set" }, |
| 108 { "3f", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3setfinal" }, | 103 { "3f", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3setfinal" }, |
| 109 { "39", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3set390" }, | 104 { "39", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3set390" }, |
| 110 { "3s", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3setnoshift" }, | 105 { "3s", "_comp_ime_bdgdidmhaijohebebipajioienkglgfohangul_3setnoshift" }, |
| (...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 981 else | 976 else |
| 982 DVLOG(1) << "Failed to initialize the candidate window controller"; | 977 DVLOG(1) << "Failed to initialize the candidate window controller"; |
| 983 } | 978 } |
| 984 | 979 |
| 985 bool InputMethodManagerImpl::IsIBusConnectionAlive() { | 980 bool InputMethodManagerImpl::IsIBusConnectionAlive() { |
| 986 return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient(); | 981 return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient(); |
| 987 } | 982 } |
| 988 | 983 |
| 989 } // namespace input_method | 984 } // namespace input_method |
| 990 } // namespace chromeos | 985 } // namespace chromeos |
| OLD | NEW |