xkb:us::eng is now always in list of available input methods at OOBE.

chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

 // Copyright (c) 2012 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/ui/webui/chromeos/login/network_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 18 matching lines @@
 namespace {
 
 const char kJsScreenPath[] = "login.NetworkScreen";
 
 // JS API callbacks names.
 const char kJsApiNetworkOnExit[] = "networkOnExit";
 const char kJsApiNetworkOnLanguageChanged[] = "networkOnLanguageChanged";
 const char kJsApiNetworkOnInputMethodChanged[] = "networkOnInputMethodChanged";
 const char kJsApiNetworkOnTimezoneChanged[] = "networkOnTimezoneChanged";
 
+const char kUSlayout[] = "xkb:us::eng";
+
 }  // namespace
 
 namespace chromeos {
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
 NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
     : BaseScreenHandler(kJsScreenPath),
       screen_(NULL),
       core_oobe_actor_(core_oobe_actor),
@@ skipping 218 matching lines @@
 
 // static
 base::ListValue* NetworkScreenHandler::GetInputMethods() {
   base::ListValue* input_methods_list = new base::ListValue;
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
   scoped_ptr<input_method::InputMethodDescriptors> input_methods(
       manager->GetActiveInputMethods());
   std::string current_input_method_id = manager->GetCurrentInputMethod().id();
+  bool default_us_layout_added = false;
   for (size_t i = 0; i < input_methods->size(); ++i) {
     const std::string ime_id = input_methods->at(i).id();
+
+    if (ime_id == kUSlayout)
+      default_us_layout_added = true;
+
     base::DictionaryValue* input_method = new base::DictionaryValue;
     input_method->SetString("value", ime_id);
     input_method->SetString(
         "title",
         util->GetInputMethodLongName(input_methods->at(i)));
     input_method->SetBoolean("selected",
         ime_id == current_input_method_id);
     input_methods_list->Append(input_method);
   }
+  // "xkb:us::eng" should always be in the list of available layouts.
+  if (!default_us_layout_added) {
+    const input_method::InputMethodDescriptor* us_eng_descriptor =
+        util->GetInputMethodDescriptorFromId(kUSlayout);
+    DCHECK(us_eng_descriptor != NULL);
+    base::DictionaryValue* input_method = new base::DictionaryValue;
+    input_method->SetString("value", kUSlayout);
+    input_method->SetString("title",
+                            util->GetInputMethodLongName(*us_eng_descriptor));
+    input_methods_list->Append(input_method);
+  }
   return input_methods_list;
 }
 
 // static
 base::ListValue* NetworkScreenHandler::GetTimezoneList() {
   std::string current_timezone_id;
   CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
 
   scoped_ptr<base::ListValue> timezone_list(new base::ListValue);
   scoped_ptr<base::ListValue> timezones = system::GetTimezoneList().Pass();
@@ skipping 12 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos