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

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

Issue 9721017: Rename ibus_input_methods.txt to input_methods.txt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-retry Created 8 years, 9 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_whitelist.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_whitelist.cc b/chrome/browser/chromeos/input_method/input_method_whitelist.cc
index 3271c74a0d0b3118ef35c8262f11b5d280a85c6c..ed79d3e52a95c04af3b08add6ee9cb4b71205948 100644
--- a/chrome/browser/chromeos/input_method/input_method_whitelist.cc
+++ b/chrome/browser/chromeos/input_method/input_method_whitelist.cc
@@ -6,18 +6,18 @@
#include <vector>
-#include "chrome/browser/chromeos/input_method/ibus_input_methods.h"
#include "chrome/browser/chromeos/input_method/input_method_descriptor.h"
+#include "chrome/browser/chromeos/input_method/input_methods.h"
namespace chromeos {
namespace input_method {
InputMethodWhitelist::InputMethodWhitelist() {
- for (size_t i = 0; i < arraysize(kIBusEngines); ++i) {
- supported_input_methods_.insert(kIBusEngines[i].input_method_id);
+ for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
+ supported_input_methods_.insert(kInputMethods[i].input_method_id);
}
- for (size_t i = 0; i < arraysize(kIBusEngines); ++i) {
- supported_layouts_.insert(kIBusEngines[i].xkb_layout_id);
+ for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
+ supported_layouts_.insert(kInputMethods[i].xkb_layout_id);
}
}
@@ -36,14 +36,14 @@ bool InputMethodWhitelist::XkbLayoutIsSupported(
InputMethodDescriptors* InputMethodWhitelist::GetSupportedInputMethods() const {
InputMethodDescriptors* input_methods = new InputMethodDescriptors;
- input_methods->reserve(arraysize(kIBusEngines));
- for (size_t i = 0; i < arraysize(kIBusEngines); ++i) {
+ input_methods->reserve(arraysize(kInputMethods));
+ for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
input_methods->push_back(InputMethodDescriptor(
*this,
- kIBusEngines[i].input_method_id,
+ kInputMethods[i].input_method_id,
"",
- kIBusEngines[i].xkb_layout_id,
- kIBusEngines[i].language_code));
+ kInputMethods[i].xkb_layout_id,
+ kInputMethods[i].language_code));
}
return input_methods;
}
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.cc ('k') | chrome/browser/chromeos/input_method/input_methods.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698