Commit 42582d95 authored by Yuki Shiino's avatar Yuki Shiino Committed by Chromium LUCI CQ

Revert "Reland "Move crostini section under Advanced in settings.""

This reverts commit 8a443cd6.

Reason for revert: Suspicious about breaking chrome_all_tast_tests.
https://ci.chromium.org/ui/p/chrome/builders/ci/chromeos-eve-chrome/12106/overview

Original change's description:
> Reland "Move crostini section under Advanced in settings."
>
> This is a reland of 3ece5c0f
>
> 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}
>
> Bug: 1163003
> Change-Id: If8e1b56cda55269d67df5e9aad21464dc9245f5f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623571
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Commit-Queue: Nicholas Verne <nverne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#842785}

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

Change-Id: Ia2686a1edb8bcc773503329b6a30b34ed891a36e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1163003
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626698Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842898}
parent 880bbdcc
...@@ -207,7 +207,7 @@ cr.define('settings', function() { ...@@ -207,7 +207,7 @@ cr.define('settings', function() {
if (loadTimeData.valueExists('showCrostini') && if (loadTimeData.valueExists('showCrostini') &&
loadTimeData.getBoolean('showCrostini')) { loadTimeData.getBoolean('showCrostini')) {
r.CROSTINI = createSection( 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_DETAILS = createSubpage(
r.CROSTINI, mojom.CROSTINI_DETAILS_SUBPAGE_PATH, r.CROSTINI, mojom.CROSTINI_DETAILS_SUBPAGE_PATH,
Subpage.kCrostiniDetails); Subpage.kCrostiniDetails);
......
...@@ -204,6 +204,10 @@ ...@@ -204,6 +204,10 @@
<iron-icon icon="os-settings:apps"></iron-icon> <iron-icon icon="os-settings:apps"></iron-icon>
$i18n{appsPageTitle} $i18n{appsPageTitle}
</a> </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"> <a href="/onstartup" hidden="[[!showStartup]]" class="item">
<iron-icon icon="os-settings:startup"></iron-icon> <iron-icon icon="os-settings:startup"></iron-icon>
$i18n{onStartupPageTitle} $i18n{onStartupPageTitle}
...@@ -240,10 +244,6 @@ ...@@ -240,10 +244,6 @@
<iron-icon icon="os-settings:print"></iron-icon> <iron-icon icon="os-settings:print"></iron-icon>
$i18n{printingPageTitle} $i18n{printingPageTitle}
</a> </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"> <a href="/osAccessibility" class="item">
<iron-icon icon="os-settings:accessibility"></iron-icon> <iron-icon icon="os-settings:accessibility"></iron-icon>
$i18n{a11yPageTitle} $i18n{a11yPageTitle}
......
...@@ -202,6 +202,14 @@ ...@@ -202,6 +202,14 @@
show-plugin-vm="[[showPluginVm]]"> show-plugin-vm="[[showPluginVm]]">
</os-settings-apps-page> </os-settings-apps-page>
</settings-section> </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]]"> <template is="dom-if" if="[[showStartup]]">
<settings-section page-title="$i18n{onStartupPageTitle}" <settings-section page-title="$i18n{onStartupPageTitle}"
section="onstartup"> section="onstartup">
...@@ -260,14 +268,6 @@ ...@@ -260,14 +268,6 @@
<os-settings-printing-page prefs="{{prefs}}"> <os-settings-printing-page prefs="{{prefs}}">
</os-settings-printing-page> </os-settings-printing-page>
</settings-section> </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}" <settings-section page-title="$i18n{a11yPageTitle}"
section="osAccessibility"> section="osAccessibility">
<os-settings-a11y-page prefs="{{prefs}}"> <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