chrome/browser/chromeos/login/session/user_session_manager.cc - Issue 653723004: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 653723004: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (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

« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.h ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1e55fc2500c09c61229db8e473cd9797b5b24f8f..4025315f6f262222101ee4b4fb21ba1b16daf8b9 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -374,7 +374,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)

@@ -442,8 +442,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;

}