Login Screen for Mus

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

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..db08451d02cb6b088b261c95cab280758f5c8387 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"
@@ -1728,6 +1729,12 @@ void UserSessionManager::RespectLocalePreferenceWrapper(
 
   const user_manager::User* const user =
       ProfileHelper::Get()->GetUserByProfile(profile);
+
+  if (chrome::IsRunningInMash()) {

[sky, 2016/05/02 15:00:03]

nit: move above 1730 as you don't use user at all.

[jonross, 2016/05/04 14:23:21]

Done.

+    callback.Run();
+    return;
+  }
+
   locale_util::SwitchLanguageCallback locale_switched_callback(base::Bind(
       &UserSessionManager::RunCallbackOnLocaleLoaded, callback,
       base::Owned(new InputEventsBlocker)));  // Block UI events until