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

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

Issue 16057010: Fix typo of Canadian multilingual keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | no next file » | 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 { "xkb:no::nob", IDS_STATUSBAR_LAYOUT_NORWAY }, 262 { "xkb:no::nob", IDS_STATUSBAR_LAYOUT_NORWAY },
263 { "xkb:se::swe", IDS_STATUSBAR_LAYOUT_SWEDEN }, 263 { "xkb:se::swe", IDS_STATUSBAR_LAYOUT_SWEDEN },
264 { "xkb:nl::nld", IDS_STATUSBAR_LAYOUT_NETHERLANDS }, 264 { "xkb:nl::nld", IDS_STATUSBAR_LAYOUT_NETHERLANDS },
265 { "xkb:latam::spa", IDS_STATUSBAR_LAYOUT_LATIN_AMERICAN }, 265 { "xkb:latam::spa", IDS_STATUSBAR_LAYOUT_LATIN_AMERICAN },
266 { "xkb:lv:apostrophe:lav", IDS_STATUSBAR_LAYOUT_LATVIA }, 266 { "xkb:lv:apostrophe:lav", IDS_STATUSBAR_LAYOUT_LATVIA },
267 { "xkb:ca::fra", IDS_STATUSBAR_LAYOUT_CANADA }, 267 { "xkb:ca::fra", IDS_STATUSBAR_LAYOUT_CANADA },
268 { "xkb:ca:eng:eng", IDS_STATUSBAR_LAYOUT_CANADA_ENGLISH }, 268 { "xkb:ca:eng:eng", IDS_STATUSBAR_LAYOUT_CANADA_ENGLISH },
269 { "xkb:il::heb", IDS_STATUSBAR_LAYOUT_ISRAEL }, 269 { "xkb:il::heb", IDS_STATUSBAR_LAYOUT_ISRAEL },
270 { "xkb:kr:kr104:kor", IDS_STATUSBAR_LAYOUT_KOREA_104 }, 270 { "xkb:kr:kr104:kor", IDS_STATUSBAR_LAYOUT_KOREA_104 },
271 { "xkb:is::ice", IDS_STATUSBAR_LAYOUT_ICELANDIC }, 271 { "xkb:is::ice", IDS_STATUSBAR_LAYOUT_ICELANDIC },
272 { "xkb:ca:multi:fra", IDS_STATUSBAR_LAYOUT_CANADIAN_MULTILINGUAL }, 272 { "xkb:ca:multix:fra", IDS_STATUSBAR_LAYOUT_CANADIAN_MULTILINGUAL },
273 273
274 { "english-m", IDS_STATUSBAR_LAYOUT_USA_MYSTERY }, 274 { "english-m", IDS_STATUSBAR_LAYOUT_USA_MYSTERY },
275 }; 275 };
276 const size_t kEnglishToResourceIdArraySize = 276 const size_t kEnglishToResourceIdArraySize =
277 arraysize(kEnglishToResourceIdArray); 277 arraysize(kEnglishToResourceIdArray);
278 278
279 // The list of language that do not have associated input methods in IBus. 279 // The list of language that do not have associated input methods in IBus.
280 // For these languages, we associate input methods here. 280 // For these languages, we associate input methods here.
281 const struct ExtraLanguage { 281 const struct ExtraLanguage {
282 const char* language_code; 282 const char* language_code;
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 if (iter != id_to_descriptor_.end()) { 701 if (iter != id_to_descriptor_.end()) {
702 const InputMethodDescriptor& input_method = iter->second; 702 const InputMethodDescriptor& input_method = iter->second;
703 language_code_to_ids_.insert( 703 language_code_to_ids_.insert(
704 std::make_pair(language_code, input_method.id())); 704 std::make_pair(language_code, input_method.id()));
705 } 705 }
706 } 706 }
707 } 707 }
708 708
709 } // namespace input_method 709 } // namespace input_method
710 } // namespace chromeos 710 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698