| 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 "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "chromeos/ime/component_extension_ime_manager.h" | 7 #include "chromeos/ime/component_extension_ime_manager.h" |
| 8 | 8 |
| 9 namespace chromeos { | 9 namespace chromeos { |
| 10 namespace { | 10 namespace { |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 for (size_t i = 0; i < component_extension_imes_.size(); ++i) { | 138 for (size_t i = 0; i < component_extension_imes_.size(); ++i) { |
| 139 for (size_t j = 0; j < component_extension_imes_[i].engines.size(); ++j) { | 139 for (size_t j = 0; j < component_extension_imes_[i].engines.size(); ++j) { |
| 140 result.push_back( | 140 result.push_back( |
| 141 input_method::InputMethodDescriptor( | 141 input_method::InputMethodDescriptor( |
| 142 GetComponentExtensionIMEId( | 142 GetComponentExtensionIMEId( |
| 143 component_extension_imes_[i].id, | 143 component_extension_imes_[i].id, |
| 144 component_extension_imes_[i].engines[j].engine_id), | 144 component_extension_imes_[i].engines[j].engine_id), |
| 145 component_extension_imes_[i].engines[j].display_name, | 145 component_extension_imes_[i].engines[j].display_name, |
| 146 component_extension_imes_[i].engines[j].layout, | 146 component_extension_imes_[i].engines[j].layout, |
| 147 component_extension_imes_[i].engines[j].language_code, | 147 component_extension_imes_[i].engines[j].language_code, |
| 148 component_extension_imes_[i].options_page_url, |
| 148 false)); | 149 false)); |
| 149 } | 150 } |
| 150 } | 151 } |
| 151 return result; | 152 return result; |
| 152 } | 153 } |
| 153 | 154 |
| 154 void ComponentExtensionIMEManager::AddObserver(Observer* observer) { | 155 void ComponentExtensionIMEManager::AddObserver(Observer* observer) { |
| 155 observers_.AddObserver(observer); | 156 observers_.AddObserver(observer); |
| 156 } | 157 } |
| 157 | 158 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 180 *out_extension = component_extension_imes_[i]; | 181 *out_extension = component_extension_imes_[i]; |
| 181 if (out_engine) | 182 if (out_engine) |
| 182 *out_engine = component_extension_imes_[i].engines[j]; | 183 *out_engine = component_extension_imes_[i].engines[j]; |
| 183 return true; | 184 return true; |
| 184 } | 185 } |
| 185 } | 186 } |
| 186 return false; | 187 return false; |
| 187 } | 188 } |
| 188 | 189 |
| 189 } // namespace chromeos | 190 } // namespace chromeos |
| OLD | NEW |