Minimal support for OOBE/login for chrome-athena

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/prefs/pref_service.h"
@@ skipping 253 matching lines @@
   // We still do not have device owner, so owner settings are not applied.
   // But Guest session can be started before owner is created, so we need to
   // save locale settings directly here.
   g_browser_process->local_state()->SetString(prefs::kApplicationLocale,
                                               self->selected_language_code_);
 
   AccessibilityManager::Get()->OnLocaleChanged();
 }
 
 void NetworkScreenHandler::HandleOnLanguageChanged(const std::string& locale) {
+#if !defined(USE_ATHENA)
   const std::string app_locale = g_browser_process->GetApplicationLocale();

[Nikita (slow), 2014/09/08 09:53:17]

I think we should have a bug filed to get this language change working.

[Dmitry Polukhin, 2014/09/08 13:28:19]

Done, crbug.com/411884

   if (app_locale == locale)
     return;
 
   base::WeakPtr<NetworkScreenHandler> weak_self =
       weak_ptr_factory_.GetWeakPtr();
   scoped_ptr<NetworkScreenHandlerOnLanguageChangedCallbackData> callback_data(
       new NetworkScreenHandlerOnLanguageChangedCallbackData(weak_self));
   scoped_ptr<locale_util::SwitchLanguageCallback> callback(
       new locale_util::SwitchLanguageCallback(
           base::Bind(&NetworkScreenHandler::OnLanguageChangedCallback,
                      base::Passed(callback_data.Pass()))));
   locale_util::SwitchLanguage(locale,
                               true /* enableLocaleKeyboardLayouts */,
                               true /* login_layouts_only */,
                               callback.Pass());
+#endif
 }
 
 void NetworkScreenHandler::HandleOnInputMethodChanged(const std::string& id) {
   input_method::InputMethodManager::Get()
       ->GetActiveIMEState()
       ->ChangeInputMethod(id, false /* show_message */);
 }
 
 void NetworkScreenHandler::HandleOnTimezoneChanged(
     const std::string& timezone_id) {
@@ skipping 49 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