Remove the flag g_use_wrapped_extension_keyboard_layouts.

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 <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 35 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";
-
 const int kDerelectDetectionTimeoutSeconds = 8 * 60 * 60;  // 8 hours.
 const int kDerelectIdleTimeoutSeconds = 5 * 60;  // 5 minutes.
 const int kOobeTimerUpdateIntervalSeconds = 5 * 60;  // 5 minutes.
 
 // Returns true if element was inserted.
 bool InsertString(const std::string& str, std::set<std::string>& to) {
   const std::pair<std::set<std::string>::iterator, bool> result =
       to.insert(str);
   return result.second;
 }
@@ skipping 375 matching lines @@
   return time_on_oobe_ >= derelict_detection_timeout_;
 }
 
 base::ListValue* NetworkScreenHandler::GetLanguageList() {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   ComponentExtensionIMEManager* comp_manager =
       manager->GetComponentExtensionIMEManager();
   input_method::InputMethodDescriptors descriptors;
-  if (extension_ime_util::UseWrappedExtensionKeyboardLayouts()) {
-    if (comp_manager->IsInitialized())
-      descriptors = comp_manager->GetXkbIMEAsInputMethodDescriptor();
-  } else {
-    descriptors = *(manager->GetSupportedInputMethods());
-  }
+  if (comp_manager->IsInitialized())
+    descriptors = comp_manager->GetXkbIMEAsInputMethodDescriptor();
   base::ListValue* languages_list =
       options::CrosLanguageOptionsHandler::GetUILanguageList(descriptors);
   for (size_t i = 0; i < languages_list->GetSize(); ++i) {
     base::DictionaryValue* language_info = NULL;
     if (!languages_list->GetDictionary(i, &language_info))
       NOTREACHED();
 
     std::string value;
     language_info->GetString("code", &value);
     std::string display_name;
@@ skipping 62 matching lines @@
   // Buttons are recreated, updated "Continue" button state.
   EnableContinue(is_continue_enabled_);
 }
 
 // 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();
-  if (extension_ime_util::UseWrappedExtensionKeyboardLayouts()) {
-    ComponentExtensionIMEManager* comp_manager =
-        manager->GetComponentExtensionIMEManager();
-    if (!comp_manager->IsInitialized()) {
-      input_method::InputMethodDescriptor fallback =
-          util->GetFallbackInputMethodDescriptor();
-      input_methods_list->Append(
-          CreateInputMethodsEntry(fallback, fallback.id()));
-      return input_methods_list;
-    }
+  ComponentExtensionIMEManager* comp_manager =
+      manager->GetComponentExtensionIMEManager();
+  if (!comp_manager->IsInitialized()) {
+    input_method::InputMethodDescriptor fallback =
+        util->GetFallbackInputMethodDescriptor();
+    input_methods_list->Append(
+        CreateInputMethodsEntry(fallback, fallback.id()));
+    return input_methods_list;
   }
 
   const std::vector<std::string>& hardware_login_input_methods =
       util->GetHardwareLoginInputMethodIds();
   manager->EnableLoginLayouts(g_browser_process->GetApplicationLocale(),
                               hardware_login_input_methods);
 
   scoped_ptr<input_method::InputMethodDescriptors> input_methods(
       manager->GetActiveInputMethods());
   const std::string& current_input_method_id =
@@ skipping 22 matching lines @@
     if (!InsertString(ime_id, input_methods_added))
       continue;
     if (!optgroup_added) {
       optgroup_added = true;
       AddOptgroupOtherLayouts(input_methods_list);
     }
     input_methods_list->Append(
         CreateInputMethodsEntry((*input_methods)[i], current_input_method_id));
   }
   // "xkb:us::eng" should always be in the list of available layouts.
-  const std::string& us_keyboard_id =
-      extension_ime_util::GetInputMethodIDByKeyboardLayout(kUSLayout);
+  const std::string us_keyboard_id =
+      util->GetFallbackInputMethodDescriptor().id();
   if (input_methods_added.find(us_keyboard_id) == input_methods_added.end()) {
     const input_method::InputMethodDescriptor* us_eng_descriptor =
         util->GetInputMethodDescriptorFromId(us_keyboard_id);
     DCHECK(us_eng_descriptor != NULL);
     if (!optgroup_added) {
       optgroup_added = true;
       AddOptgroupOtherLayouts(input_methods_list);
     }
     input_methods_list->Append(
         CreateInputMethodsEntry(*us_eng_descriptor, current_input_method_id));
@@ skipping 23 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