OLD | NEW |
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 #include "chromeos/ime/component_extension_ime_manager.h" | 5 #include "chromeos/ime/component_extension_ime_manager.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "chromeos/ime/extension_ime_util.h" | 9 #include "chromeos/ime/extension_ime_util.h" |
10 | 10 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 ComponentExtensionIMEManager::GetAllIMEAsInputMethodDescriptor() { | 129 ComponentExtensionIMEManager::GetAllIMEAsInputMethodDescriptor() { |
130 input_method::InputMethodDescriptors result; | 130 input_method::InputMethodDescriptors result; |
131 for (size_t i = 0; i < component_extension_imes_.size(); ++i) { | 131 for (size_t i = 0; i < component_extension_imes_.size(); ++i) { |
132 for (size_t j = 0; j < component_extension_imes_[i].engines.size(); ++j) { | 132 for (size_t j = 0; j < component_extension_imes_[i].engines.size(); ++j) { |
133 result.push_back( | 133 result.push_back( |
134 input_method::InputMethodDescriptor( | 134 input_method::InputMethodDescriptor( |
135 extension_ime_util::GetComponentInputMethodID( | 135 extension_ime_util::GetComponentInputMethodID( |
136 component_extension_imes_[i].id, | 136 component_extension_imes_[i].id, |
137 component_extension_imes_[i].engines[j].engine_id), | 137 component_extension_imes_[i].engines[j].engine_id), |
138 component_extension_imes_[i].engines[j].display_name, | 138 component_extension_imes_[i].engines[j].display_name, |
| 139 std::string(), // TODO(uekawa): Set short name. |
139 component_extension_imes_[i].engines[j].layouts, | 140 component_extension_imes_[i].engines[j].layouts, |
140 component_extension_imes_[i].engines[j].language_codes, | 141 component_extension_imes_[i].engines[j].language_codes, |
141 false, // Do not use IME on login screen. | 142 false, // Do not use IME on login screen. |
142 component_extension_imes_[i].options_page_url, | 143 component_extension_imes_[i].options_page_url, |
143 component_extension_imes_[i].input_view_url)); | 144 component_extension_imes_[i].input_view_url)); |
144 } | 145 } |
145 } | 146 } |
146 return result; | 147 return result; |
147 } | 148 } |
148 | 149 |
(...skipping 27 matching lines...) Expand all Loading... |
176 *out_extension = component_extension_imes_[i]; | 177 *out_extension = component_extension_imes_[i]; |
177 if (out_engine) | 178 if (out_engine) |
178 *out_engine = component_extension_imes_[i].engines[j]; | 179 *out_engine = component_extension_imes_[i].engines[j]; |
179 return true; | 180 return true; |
180 } | 181 } |
181 } | 182 } |
182 return false; | 183 return false; |
183 } | 184 } |
184 | 185 |
185 } // namespace chromeos | 186 } // namespace chromeos |
OLD | NEW |