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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_util.cc

Issue 10408040: Add Malay to the "Languages and Input" configuration screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // Language Code Input Method ID 269 // Language Code Input Method ID
270 { "en-AU", "xkb:us::eng" }, // For Austrailia, use US keyboard layout. 270 { "en-AU", "xkb:us::eng" }, // For Austrailia, use US keyboard layout.
271 { "id", "xkb:us::eng" }, // For Indonesian, use US keyboard layout. 271 { "id", "xkb:us::eng" }, // For Indonesian, use US keyboard layout.
272 // The code "fil" comes from l10_util.cc. 272 // The code "fil" comes from l10_util.cc.
273 { "fil", "xkb:us::eng" }, // For Filipino, use US keyboard layout. 273 { "fil", "xkb:us::eng" }, // For Filipino, use US keyboard layout.
274 // For Netherlands, use US international keyboard layout. 274 // For Netherlands, use US international keyboard layout.
275 { "nl", "xkb:us:intl:eng" }, 275 { "nl", "xkb:us:intl:eng" },
276 // The code "es-419" comes from l10_util.cc. 276 // The code "es-419" comes from l10_util.cc.
277 // For Spanish in Latin America, use Latin American keyboard layout. 277 // For Spanish in Latin America, use Latin American keyboard layout.
278 { "es-419", "xkb:latam::spa" }, 278 { "es-419", "xkb:latam::spa" },
279 // For Malay, use US keyboard layout. crosbug.com/p/8288
280 { "ms", "xkb:us::eng" },
279 281
280 // TODO(yusukes): Add {"sw", "xkb:us::eng"} once Swahili is removed from the 282 // TODO(yusukes): Add {"sw", "xkb:us::eng"} once Swahili is removed from the
281 // blacklist in src/ui/base/l10n/l10n_util_posix.cc. 283 // blacklist in src/ui/base/l10n/l10n_util_posix.cc.
282 }; 284 };
283 const size_t kExtraLanguagesLength = arraysize(kExtraLanguages); 285 const size_t kExtraLanguagesLength = arraysize(kExtraLanguages);
284 286
285 InputMethodUtil::InputMethodUtil( 287 InputMethodUtil::InputMethodUtil(
286 InputMethodDescriptors* supported_input_methods) 288 InputMethodDescriptors* supported_input_methods)
287 : supported_input_methods_(supported_input_methods) { 289 : supported_input_methods_(supported_input_methods) {
288 ReloadInternalMaps(); 290 ReloadInternalMaps();
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 ReloadInternalMaps(); 690 ReloadInternalMaps();
689 } 691 }
690 692
691 void InputMethodUtil::SetHardwareInputMethodIdForTesting( 693 void InputMethodUtil::SetHardwareInputMethodIdForTesting(
692 const std::string& input_method_id) { 694 const std::string& input_method_id) {
693 hardware_input_method_id_for_testing_ = input_method_id; 695 hardware_input_method_id_for_testing_ = input_method_id;
694 } 696 }
695 697
696 } // namespace input_method 698 } // namespace input_method
697 } // namespace chromeos 699 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698