Commit 97279836 authored by James Cook's avatar James Cook Committed by Commit Bot

SplitSettings: Hide Personalization section in guest mode

Neither wallpaper nor account image can be changed in guest mode,
so hide the entire "Personalization" section.

However, ensure the "Appearance" section is still visible in browser
settings, since font size can still be changed.

Screenshots:
- OS settings - http://screen/U7f46skHwXw
- Browser settings - http://screen/kAEEMMpYML7

Bug: 972152
Change-Id: I95196b506a155d98fb8315ab302e9dc5f847e1a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1719468Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681284}
parent 951c09a3
......@@ -158,7 +158,8 @@
$i18n{peoplePageTitle}
</div>
</a>
<a id="personalization" href="/personalization">
<a id="personalization" href="/personalization"
hidden="[[!pageVisibility.personalization]]">
<div class="item">
<iron-icon icon="settings:palette"></iron-icon>
$i18n{personalizationPageTitle}
......
......@@ -127,14 +127,12 @@
</os-settings-people-page>
</settings-section>
</template>
<!-- TODO(hsuregan): Change from appearance to personalization once
pageVisibility is forked for OS Settings.-->
<template is="dom-if" if="[[showPage_(pageVisibility.appearance)]]"
<template is="dom-if" if="[[showPage_(pageVisibility.personalization)]]"
restamp>
<settings-section page-title="$i18n{personalizationPageTitle}"
section="personalization">
<settings-personalization-page
page-visibility="[[pageVisibility.appearance]]">
page-visibility="[[pageVisibility.personalization]]">
</settings-personalization-page>
</settings-section>
</template>
......
......@@ -15,7 +15,7 @@ Polymer({
properties: {
/**
* Dictionary defining page visibility.
* @type {!AppearancePageVisibility}
* @type {!PersonalizationPageVisibility}
*/
pageVisibility: Object,
......@@ -47,10 +47,8 @@ Polymer({
ready: function() {
this.browserProxy_.isWallpaperSettingVisible().then(
isWallpaperSettingVisible => {
// TODO(hsuregan): Uncomment after forking new pageVisibility for
// OS settings.
// assert(this.pageVisibility);
// this.pageVisibility.setWallpaper = isWallpaperSettingVisible;
assert(this.pageVisibility);
this.pageVisibility.setWallpaper = isWallpaperSettingVisible;
});
this.browserProxy_.isWallpaperPolicyControlled().then(
isPolicyControlled => {
......
......@@ -22,6 +22,7 @@
* multidevice: (boolean|undefined),
* onStartup: (boolean|undefined),
* people: (boolean|undefined|PeoplePageVisibility),
* personalization: (boolean|undefined|PersonalizationPageVisibility),
* printing: (boolean|undefined),
* privacy: (boolean|undefined|PrivacyPageVisibility),
* reset:(boolean|undefined|ResetPageVisibility),
......@@ -37,6 +38,7 @@ let PageVisibility;
let A11yPageVisibility;
/**
* TODO(crbug.com/950007): Remove setWallpaper after SplitSettings launch.
* @typedef {{
* bookmarksBar: boolean,
* homeButton: boolean,
......@@ -65,6 +67,13 @@ let DownloadsPageVisibility;
*/
let PeoplePageVisibility;
/**
* @typedef {{
* setWallpaper: boolean,
* }}
*/
let PersonalizationPageVisibility;
/**
* @typedef {{
* contentProtectionAttestation: boolean,
......@@ -123,6 +132,7 @@ cr.define('settings', function() {
multidevice: false,
autofill: false,
people: false,
personalization: false,
onStartup: false,
reset: false,
appearance: {
......@@ -171,6 +181,10 @@ cr.define('settings', function() {
googleAccounts: showOSSettings,
manageUsers: showOSSettings,
},
personalization: {
// Personalization is in OS settings only, so section always shows.
setWallpaper: true,
},
onStartup: true,
reset: {
powerwash: showOSSettings,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment