Add missing resource IDs for keyboard layouts.

chrome/browser/chromeos/input_method/input_method_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 181 matching lines @@
   { "USA", IDS_STATUSBAR_LAYOUT_USA },
   { "Lithuania", IDS_STATUSBAR_LAYOUT_LITHUANIA },
   { "United Kingdom - Extended - Winkeys",
     IDS_STATUSBAR_LAYOUT_UNITED_KINGDOM },
   { "Slovakia", IDS_STATUSBAR_LAYOUT_SLOVAKIA },
   { "Russia", IDS_STATUSBAR_LAYOUT_RUSSIA },
   { "Greece", IDS_STATUSBAR_LAYOUT_GREECE },
   { "Belgium", IDS_STATUSBAR_LAYOUT_BELGIUM },
   { "Bulgaria", IDS_STATUSBAR_LAYOUT_BULGARIA },
   { "Switzerland", IDS_STATUSBAR_LAYOUT_SWITZERLAND },
+  { "Switzerland - French", IDS_STATUSBAR_LAYOUT_SWITZERLAND_FRENCH },
   { "Turkey", IDS_STATUSBAR_LAYOUT_TURKEY },
   { "Portugal", IDS_STATUSBAR_LAYOUT_PORTUGAL },
   { "Spain", IDS_STATUSBAR_LAYOUT_SPAIN },
   { "Finland", IDS_STATUSBAR_LAYOUT_FINLAND },
   { "Ukraine", IDS_STATUSBAR_LAYOUT_UKRAINE },
   { "Spain - Catalan variant with middle-dot L",
     IDS_STATUSBAR_LAYOUT_SPAIN_CATALAN },
   { "France", IDS_STATUSBAR_LAYOUT_FRANCE },
   { "Norway", IDS_STATUSBAR_LAYOUT_NORWAY },
   { "Sweden", IDS_STATUSBAR_LAYOUT_SWEDEN },
   { "Netherlands", IDS_STATUSBAR_LAYOUT_NETHERLANDS },
   { "Latvia", IDS_STATUSBAR_LAYOUT_LATVIA },
+  { "Canada", IDS_STATUSBAR_LAYOUT_CANADA },
+  { "Canada - English", IDS_STATUSBAR_LAYOUT_CANADA_ENGLISH },
 };
 const size_t kNumEntries = arraysize(kEnglishToResourceIdArray);
 
 // There are some differences between ISO 639-2 (T) and ISO 639-2 B, and
 // some language codes are not recognized by ICU (i.e. ICU cannot convert
 // these codes to two-letter language codes and display names). Hence we
 // convert these codes to ones that ICU recognize.
 //
 // See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes for details.
 const char* kIso639VariantMapping[][2] = {
@@ skipping 384 matching lines @@
   value.string_list_value = input_method_ids;
   InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
   library->SetImeConfig(kGeneralSectionName, kPreloadEnginesConfigName, value);
   if (!initial_input_method_id.empty()) {
     library->ChangeInputMethod(initial_input_method_id);
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos