| Index: chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
|
| index a2ce9e2d2fe7739467eaf1a3eb4e0c788b0d726e..316eaa35822b3235f695b8c6288f1b03a8c14261 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
|
| @@ -62,7 +62,7 @@ DeviceLocalAccountPolicyProvider::Create(
|
| chrome_policy_overrides->Set(
|
| key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
|
| POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| chromeos::PowerPolicyController::ACTION_STOP_SESSION),
|
| nullptr);
|
| // Force the |ShelfAutoHideBehavior| policy to |Never|, ensuring that the
|
| @@ -73,16 +73,16 @@ DeviceLocalAccountPolicyProvider::Create(
|
| base::MakeUnique<base::StringValue>("Never"), nullptr);
|
| // Force the |ShowLogoutButtonInTray| policy to |true|, ensuring that a big,
|
| // red logout button is shown in the ash system tray.
|
| - chrome_policy_overrides->Set(
|
| - key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_MACHINE, POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
|
| - base::MakeUnique<base::FundamentalValue>(true), nullptr);
|
| + chrome_policy_overrides->Set(key::kShowLogoutButtonInTray,
|
| + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
|
| + POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
|
| + base::MakeUnique<base::Value>(true), nullptr);
|
| // Force the |FullscreenAllowed| policy to |false|, ensuring that the ash
|
| // shelf cannot be hidden by entering fullscreen mode.
|
| - chrome_policy_overrides->Set(
|
| - key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
|
| - POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + chrome_policy_overrides->Set(key::kFullscreenAllowed,
|
| + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
|
| + POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| }
|
|
|
| std::unique_ptr<DeviceLocalAccountPolicyProvider> provider(
|
|
|