Minimal support for OOBE/login for chrome-athena

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

Index: chrome/browser/ui/webui/chromeos/login/l10n_util.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
index 74a44ee0cabeb8197b338f8abddbabae5c8707ec..db3599eb00fb2df46b8e02fd21e9307e22a7195c 100644
--- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
+++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
@@ -59,6 +59,7 @@ bool InsertString(const std::string& str, std::set<std::string>* to) {
   return result.second;
 }
 
+#if !defined(USE_ATHENA)
 void AddOptgroupOtherLayouts(base::ListValue* input_methods_list) {
   scoped_ptr<base::DictionaryValue> optgroup(new base::DictionaryValue);
   optgroup->SetString(
@@ -66,6 +67,7 @@ void AddOptgroupOtherLayouts(base::ListValue* input_methods_list) {
       l10n_util::GetStringUTF16(IDS_OOBE_OTHER_KEYBOARD_LAYOUTS));
   input_methods_list->Append(optgroup.release());
 }
+#endif
 
 // TODO(zork): Remove this blacklist when fonts are added to Chrome OS.
 // see: crbug.com/240586
@@ -412,6 +414,7 @@ scoped_ptr<base::ListValue> GetAndActivateLoginKeyboardLayouts(
     const std::string& locale,
     const std::string& selected) {
   scoped_ptr<base::ListValue> input_methods_list(new base::ListValue);
+#if !defined(USE_ATHENA)
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
@@ -470,6 +473,7 @@ scoped_ptr<base::ListValue> GetAndActivateLoginKeyboardLayouts(
     input_methods_list->Append(CreateInputMethodsEntry(*us_eng_descriptor,
                                                        selected).release());
   }
+#endif
   return input_methods_list.Pass();
 }