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

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

Issue 7385007: chromeos: Fix chromeos TODO in input_method_util.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/input_method_util.h
diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h
index 2b13f4222a2b47da4aff856e491b404922a48f6e..0dd7897a789aad8b1828f886196bb67937234de6 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.h
+++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
#pragma once
+#include <cstddef>
#include <map>
#include <string>
#include <vector>
@@ -18,21 +19,12 @@ namespace input_method {
// The list of language that do not have associated input methods in IBus.
// For these languages, we associate input methods here.
-const struct ExtraLanguage {
+struct ExtraLanguage {
const char* language_code;
const char* input_method_id;
-} kExtraLanguages[] = {
- { "en-AU", "xkb:us::eng" }, // For Austrailia, use US keyboard layout.
- { "id", "xkb:us::eng" }, // For Indonesian, use US keyboard layout.
- // The code "fil" comes from app/l10_util.cc.
- { "fil", "xkb:us::eng" }, // For Filipino, use US keyboard layout.
- // For Netherlands, use US international keyboard layout.
- { "nl", "xkb:us:intl:eng" },
- // The code "es-419" comes from app/l10_util.cc.
- // For Spanish in Latin America, use Latin American keyboard layout.
- { "es-419", "xkb:latam::spa" },
};
-// TODO(yusukes): Move |kExtraLanguages| to input_method_util.cc.
+extern const ExtraLanguage kExtraLanguages[];
+extern const size_t kExtraLanguagesLength;
// Converts a string sent from IBus IME engines, which is written in English,
// into Chrome's string ID, then pulls internationalized resource string from
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698