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

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 664503003: Revert of Revert of Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (patchs… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 6e2159ce976722978eeef9d85aeaec204eca2838..de2ea43d9dff7611163003e0b5b2434c2474cf40 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -411,7 +411,7 @@
bool UserSessionManager::RespectLocalePreference(
Profile* profile,
const user_manager::User* user,
- const locale_util::SwitchLanguageCallback& callback) const {
+ scoped_ptr<locale_util::SwitchLanguageCallback> callback) const {
// TODO(alemate): http://crbug.com/288941 : Respect preferred language list in
// the Google user profile.
if (g_browser_process == NULL)
@@ -479,8 +479,10 @@
// So input methods should be enabled somewhere.
const bool enable_layouts =
user_manager::UserManager::Get()->IsLoggedInAsGuest();
- locale_util::SwitchLanguage(
- pref_locale, enable_layouts, false /* login_layouts_only */, callback);
+ locale_util::SwitchLanguage(pref_locale,
+ enable_layouts,
+ false /* login_layouts_only */,
+ callback.Pass());
return true;
}

Powered by Google App Engine
This is Rietveld 408576698