| 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 ca18cb3da3462bc1d4f9ca3cbfc14a836309ea8c..96086a64b1e90d1d9b3b62df388f54552ffcfeed 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -76,6 +76,7 @@
|
| #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
|
| #include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"
|
| #include "chrome/browser/ui/app_list/start_page_service.h"
|
| +#include "chrome/browser/ui/ash/ash_util.h"
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
|
| #include "chrome/browser/ui/startup/startup_browser_creator.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -1726,6 +1727,12 @@ void UserSessionManager::RespectLocalePreferenceWrapper(
|
| if (browser_shutdown::IsTryingToQuit())
|
| return;
|
|
|
| + // InputEventsBlocker is not available in Mash
|
| + if (chrome::IsRunningInMash()) {
|
| + callback.Run();
|
| + return;
|
| + }
|
| +
|
| const user_manager::User* const user =
|
| ProfileHelper::Get()->GetUserByProfile(profile);
|
| locale_util::SwitchLanguageCallback locale_switched_callback(base::Bind(
|
|
|