Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(968)

Unified Diff: chrome/browser/chromeos/input_method/input_method_util.cc

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed unit_tests. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 2b55dcbdb97dcea2ff9b2c793e39d29e8d66603d..5d83213ca0162ea1540b1c34f88a2679acb78839 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -245,16 +245,11 @@ namespace chromeos {
namespace input_method {
-InputMethodUtil::InputMethodUtil(
- InputMethodDelegate* delegate,
- scoped_ptr<InputMethodDescriptors> supported_input_methods)
+InputMethodUtil::InputMethodUtil(InputMethodDelegate* delegate)
: delegate_(delegate) {
- // Makes sure the supported input methods at least have the fallback ime.
- // So that it won't cause massive test failures.
- if (supported_input_methods->empty())
- supported_input_methods->push_back(GetFallbackInputMethodDescriptor());
-
- ResetInputMethods(*supported_input_methods);
+ InputMethodDescriptors default_input_methods;
+ default_input_methods.push_back(GetFallbackInputMethodDescriptor());
+ ResetInputMethods(default_input_methods);
// Initialize a map from English string to Chrome string resource ID as well.
for (size_t i = 0; i < kEnglishToResourceIdArraySize; ++i) {

Powered by Google App Engine
This is Rietveld 408576698