Prevent public session users from changing locale via settings

Prevent public session users from changing locale via settings

Changes to the locale made via the settings screen persist outside the
current session and affect e.g. the login screen. Public session users
should not be permitted to make such changes.

BUG=214904
TEST=Manual - public session cannot, regular user can change locale

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285091

[bartfab (slow), 2014-07-22 18:00:46]

Hi James,

Could you take a look at chrome/browser/resources/options/*?

Hi Nikita,

Could you take a look at cros_language_options_handler.cc?

[James Hawkins, 2014-07-22 21:12:47]

lgtm

[Nikita (slow), 2014-07-23 10:37:07]

lgtm

[bartfab (slow), 2014-07-23 11:05:01]

The CQ bit was checked by bartfab@chromium.org

[commit-bot: I haz the power, 2014-07-23 11:06:04]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/bartfab@chromium.org/412583002/1

[commit-bot: I haz the power, 2014-07-23 16:00:53]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[commit-bot: I haz the power, 2014-07-23 16:21:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-23 16:21:43]

Try jobs failed on following builders:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[bartfab (slow), 2014-07-23 16:32:55]

The CQ bit was checked by bartfab@chromium.org

[commit-bot: I haz the power, 2014-07-23 16:34:55]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/bartfab@chromium.org/412583002/1

[commit-bot: I haz the power, 2014-07-23 17:05:54]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[commit-bot: I haz the power, 2014-07-23 17:47:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-23 17:47:56]

Failed to apply patch for
chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
  Hunk #1 succeeded at 25 (offset -8 lines).
  Hunk #2 FAILED at 450.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc.rej

Patch:      
chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
diff --git
a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
index
3c31fccf733cf60ed4d0e8b06112999b837e375c..17c5e19c09775d49be937ed47491ee4665a249f2
100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
@@ -33,6 +33,7 @@
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
+#include "components/user_manager/user_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ -449,9 +450,11 @@ void CrosLanguageOptionsHandler::SetApplicationLocale(
   Profile* profile = Profile::FromWebUI(web_ui());
   UserManager* user_manager = UserManager::Get();
 
-  // Only the primary user can change the locale.
+  // Secondary users and public session users cannot change the locale.
   User* user = ProfileHelper::Get()->GetUserByProfile(profile);
-  if (user && user->email() == user_manager->GetPrimaryUser()->email()) {
+  if (user &&
+      user->email() == user_manager->GetPrimaryUser()->email() &&
+      user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) {
     profile->ChangeAppLocale(language_code,
                              Profile::APP_LOCALE_CHANGED_VIA_SETTINGS);
   }

[bartfab (slow), 2014-07-23 18:05:46]

The CQ bit was checked by bartfab@chromium.org

[commit-bot: I haz the power, 2014-07-23 18:06:39]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/bartfab@chromium.org/412583002/20001

[commit-bot: I haz the power, 2014-07-24 00:51:38]

Change committed as 285091