| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <algorithm> // std::find | 9 #include <algorithm> // std::find |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1246 auto j = overridden_ref.find("&", i + 1); | 1246 auto j = overridden_ref.find("&", i + 1); |
| 1247 if (j == std::string::npos) { | 1247 if (j == std::string::npos) { |
| 1248 overridden_ref += "." + keyset; | 1248 overridden_ref += "." + keyset; |
| 1249 } else { | 1249 } else { |
| 1250 overridden_ref.replace(j, 0, "." + keyset); | 1250 overridden_ref.replace(j, 0, "." + keyset); |
| 1251 } | 1251 } |
| 1252 | 1252 |
| 1253 GURL::Replacements replacements; | 1253 GURL::Replacements replacements; |
| 1254 replacements.SetRefStr(overridden_ref); | 1254 replacements.SetRefStr(overridden_ref); |
| 1255 keyboard::SetOverrideContentUrl(url.ReplaceComponents(replacements)); | 1255 keyboard::SetOverrideContentUrl(url.ReplaceComponents(replacements)); |
| 1256 |
| 1257 keyboard::KeyboardController* keyboard_controller = |
| 1258 keyboard::KeyboardController::GetInstance(); |
| 1259 if (keyboard_controller) |
| 1260 keyboard_controller->Reload(); |
| 1256 } | 1261 } |
| 1257 | 1262 |
| 1258 bool InputMethodManagerImpl::IsEmojiHandwritingVoiceOnImeMenuEnabled() { | 1263 bool InputMethodManagerImpl::IsEmojiHandwritingVoiceOnImeMenuEnabled() { |
| 1259 return base::FeatureList::IsEnabled(features::kEHVInputOnImeMenu); | 1264 return base::FeatureList::IsEnabled(features::kEHVInputOnImeMenu); |
| 1260 } | 1265 } |
| 1261 | 1266 |
| 1262 } // namespace input_method | 1267 } // namespace input_method |
| 1263 } // namespace chromeos | 1268 } // namespace chromeos |
| OLD | NEW |