| Index: chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| index b129c5b5849d75c8de81bd188c2a88b6d4f329cf..8a0c187a20d35c020a71a2e3ae6361ec8c1e4998 100644
|
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| @@ -48,15 +48,16 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Dictionary defining page visibility.
|
| - * This is only set when in guest mode. All pages are visible when not set
|
| - * because polymer only notifies after a property is set.
|
| - * @private {!GuestModePageVisibility}
|
| + * Dictionary defining page visibility. Pages are hidden when their entry
|
| + * is set to *false*. i.e. visibility defaults to true.
|
| + * @private {!PageVisibility}
|
| */
|
| - pageVisibility_: Object,
|
| -
|
| - /** @private */
|
| - showAndroidApps_: Boolean,
|
| + pageVisibility_: {
|
| + type: Object,
|
| + value: function() {
|
| + return {};
|
| + },
|
| + },
|
|
|
| /** @private */
|
| lastSearchQuery_: {
|
| @@ -155,8 +156,11 @@ Polymer({
|
| };
|
| }
|
|
|
| - this.showAndroidApps_ = loadTimeData.valueExists('androidAppsAllowed') &&
|
| +// <if expr="chromeos">
|
| + this.pageVisibility_.androidApps =
|
| + loadTimeData.valueExists('androidAppsAllowed') &&
|
| loadTimeData.getBoolean('androidAppsAllowed');
|
| +// </if>
|
| },
|
|
|
| /** @private {?IntersectionObserver} */
|
|
|