Commit 7d947d5e authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Chromium LUCI CQ

Revert "Move crostini section under Advanced in settings."

This reverts commit 3ece5c0f.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1163902

Original change's description:
> Move crostini section under Advanced in settings.
>
> Bug: 1163003
> Change-Id: I9b2b439007c80bc0385128da4817ac001ee7eb0c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2610407
> Auto-Submit: Nicholas Verne <nverne@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Commit-Queue: Nicholas Verne <nverne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#840920}

TBR=khorimoto@chromium.org,nverne@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I77bde9769710657da5d0992728dd53006a83de2c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1163003, 1163902
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2615667
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841138}
parent 455bfb16
......@@ -207,7 +207,7 @@ cr.define('settings', function() {
if (loadTimeData.valueExists('showCrostini') &&
loadTimeData.getBoolean('showCrostini')) {
r.CROSTINI = createSection(
r.ADVANCED, mojom.CROSTINI_SECTION_PATH, Section.kCrostini);
r.BASIC, mojom.CROSTINI_SECTION_PATH, Section.kCrostini);
r.CROSTINI_DETAILS = createSubpage(
r.CROSTINI, mojom.CROSTINI_DETAILS_SUBPAGE_PATH,
Subpage.kCrostiniDetails);
......
......@@ -204,6 +204,10 @@
<iron-icon icon="os-settings:apps"></iron-icon>
$i18n{appsPageTitle}
</a>
<a href="/crostini" hidden="[[!showCrostini]]" class="item">
<iron-icon icon="os-settings:developer-tags"></iron-icon>
$i18n{crostiniPageTitle}
</a>
<a href="/onstartup" hidden="[[!showStartup]]" class="item">
<iron-icon icon="os-settings:startup"></iron-icon>
$i18n{onStartupPageTitle}
......@@ -240,10 +244,6 @@
<iron-icon icon="os-settings:print"></iron-icon>
$i18n{printingPageTitle}
</a>
<a href="/crostini" hidden="[[!showCrostini]]" class="item">
<iron-icon icon="os-settings:developer-tags"></iron-icon>
$i18n{crostiniPageTitle}
</a>
<a href="/osAccessibility" class="item">
<iron-icon icon="os-settings:accessibility"></iron-icon>
$i18n{a11yPageTitle}
......
......@@ -202,6 +202,14 @@
show-plugin-vm="[[showPluginVm]]">
</os-settings-apps-page>
</settings-section>
<template is="dom-if" if="[[showCrostini]]" restamp>
<settings-section page-title="$i18n{crostiniPageTitle}"
section="crostini">
<settings-crostini-page prefs="{{prefs}}"
allow-crostini="[[allowCrostini_]]">
</settings-crostini-page>
</settings-section>
</template>
<template is="dom-if" if="[[showStartup]]">
<settings-section page-title="$i18n{onStartupPageTitle}"
section="onstartup">
......@@ -260,14 +268,6 @@
<os-settings-printing-page prefs="{{prefs}}">
</os-settings-printing-page>
</settings-section>
<template is="dom-if" if="[[showCrostini]]" restamp>
<settings-section page-title="$i18n{crostiniPageTitle}"
section="crostini">
<settings-crostini-page prefs="{{prefs}}"
allow-crostini="[[allowCrostini_]]">
</settings-crostini-page>
</settings-section>
</template>
<settings-section page-title="$i18n{a11yPageTitle}"
section="osAccessibility">
<os-settings-a11y-page prefs="{{prefs}}">
......
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