| Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
|
| index d1a7531aa1721b1ef2cfc3fd6ffe835ad7eb2280..8bf028754d98aa3a24f4cec7e2f947fdfcd508a6 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
|
| @@ -82,9 +82,11 @@ void TermsOfServiceScreenHandler::Show() {
|
| return;
|
| }
|
|
|
| - const std::string locale = ProfileHelper::Get()->GetProfileByUser(
|
| - UserManager::Get()->GetActiveUser())->GetPrefs()->GetString(
|
| - prefs::kApplicationLocale);
|
| + const std::string locale =
|
| + ProfileHelper::Get()
|
| + ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser())
|
| + ->GetPrefs()
|
| + ->GetString(prefs::kApplicationLocale);
|
| if (locale.empty() || locale == g_browser_process->GetApplicationLocale()) {
|
| // If the user has not chosen a UI locale yet or the chosen locale matches
|
| // the current UI locale, show the screen immediately.
|
| @@ -148,9 +150,10 @@ void TermsOfServiceScreenHandler::DoShow() {
|
| // Determine the user's most preferred input method.
|
| std::vector<std::string> input_methods;
|
| base::SplitString(
|
| - ProfileHelper::Get()->GetProfileByUser(
|
| - UserManager::Get()->GetActiveUser())->GetPrefs()->GetString(
|
| - prefs::kLanguagePreloadEngines),
|
| + ProfileHelper::Get()
|
| + ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser())
|
| + ->GetPrefs()
|
| + ->GetString(prefs::kLanguagePreloadEngines),
|
| ',',
|
| &input_methods);
|
|
|
|
|