| 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 4025315f6f262222101ee4b4fb21ba1b16daf8b9..1e55fc2500c09c61229db8e473cd9797b5b24f8f 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 @@ void UserSessionManager::SetAppModeChromeClientOAuthInfo(
|
| bool UserSessionManager::RespectLocalePreference(
|
| Profile* profile,
|
| const user_manager::User* user,
|
| - scoped_ptr<locale_util::SwitchLanguageCallback> callback) const {
|
| + const 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,10 +442,8 @@ bool UserSessionManager::RespectLocalePreference(
|
| // 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.Pass());
|
| + locale_util::SwitchLanguage(
|
| + pref_locale, enable_layouts, false /* login_layouts_only */, callback);
|
|
|
| return true;
|
| }
|
|
|