Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6634)

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: overscroll Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 317f6ca80e9408ce7cde18758e5eca238b6daa44..0c40536ac03a9f3f6a250c2206b9051f1f17696c 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -271,6 +271,7 @@ void NetworkScreenHandler::OnLanguageChangedCallback(
}
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 lan
Dmitry Polukhin 2014/09/08 13:28:19 Done, crbug.com/411884
if (app_locale == locale)
return;
@@ -287,6 +288,7 @@ void NetworkScreenHandler::HandleOnLanguageChanged(const std::string& locale) {
true /* enableLocaleKeyboardLayouts */,
true /* login_layouts_only */,
callback.Pass());
+#endif
}
void NetworkScreenHandler::HandleOnInputMethodChanged(const std::string& id) {

Powered by Google App Engine
This is Rietveld 408576698