Skip to content

Commit

Permalink
CrOS Settings: Remove advanced page template
Browse files Browse the repository at this point in the history 
Given the revamp is launched, there is no advanced section so it can be
removed. Reincorporate the About page into the main group of top-level
pages and remove other obsolete code.

Bug: b:370837609
Test: browser_tests
Change-Id: I8e429e3d260814b9d920d501f763a267864b4351
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6042896
Reviewed-by: Nikki Moteva <[email protected]>
Commit-Queue: Wes Okuhara <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1387928}
  • Loading branch information
@pull
Wes Okuhara authored and pull[bot] committed Dec 7, 2024
1 parent 0709851 commit 1002647
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 383 deletions.
269 changes: 130 additions & 139 deletions chrome/browser/resources/ash/settings/main_page_container/main_page_container.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,146 +117,137 @@
language-helper="{{languageHelper_}}">
</settings-languages>

<div id="basicPageContainer"
hidden$="[[!shouldShowBasicPageContainer_]]">
<template is="dom-if" if="[[computeShowUpdateRequiredEolBanner_(
isShowingSubpage_, showUpdateRequiredEolBanner_,
showEOLIncentive_)]]">
<div id="updateRequiredEolBanner"
class="settings-box two-line banner">
<div class="eol-warning-icon">
<iron-icon icon="cr20:banner-warning"></iron-icon>
</div>
<localized-link id="bannerText" class="start"
localized-string="$i18n{updateRequiredEolBannerText}">
</localized-link>
<cr-icon-button title="$i18n{close}" id="closeUpdateRequiredEol"
class="icon-clear" on-click="onCloseEolBannerClicked_"
aria-describedby="bannerText">
</cr-icon-button>
<div id="mainPageContainer">
<template is="dom-if" if="[[computeShowUpdateRequiredEolBanner_(
isShowingSubpage_, showUpdateRequiredEolBanner_,
showEOLIncentive_)]]">
<div id="updateRequiredEolBanner"
class="settings-box two-line banner">
<div class="eol-warning-icon">
<iron-icon icon="cr20:banner-warning"></iron-icon>
</div>
</template>
<template is="dom-if" if="[[computeShowEolIncentive_(isShowingSubpage_,
showEolIncentive_)]]">
<eol-offer-section should-show-offer-text="[[shouldShowOfferText_]]">
</eol-offer-section>
</template>
<div id="secondaryUserBanner" class="settings-box two-line banner"
hidden="[[!showSecondaryUserBanner_]]">
<div id="secondaryUserIcon">
<iron-icon icon="os-settings:social-group"></iron-icon>
</div>
<div class="flex">$i18n{secondaryUserBannerText}</div>
<localized-link id="bannerText" class="start"
localized-string="$i18n{updateRequiredEolBannerText}">
</localized-link>
<cr-icon-button title="$i18n{close}" id="closeUpdateRequiredEol"
class="icon-clear" on-click="onCloseEolBannerClicked_"
aria-describedby="bannerText">
</cr-icon-button>
</div>

<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kNetwork)]]"
restamp>
<page-displayer section="[[Section.kNetwork]]">
<settings-internet-page prefs="{{prefs}}">
</settings-internet-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kBluetooth)]]"
restamp>
<page-displayer section="[[Section.kBluetooth]]">
<os-settings-bluetooth-page prefs="{{prefs}}">
</os-settings-bluetooth-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kMultiDevice)]]"
restamp>
<page-displayer section="[[Section.kMultiDevice]]">
<settings-multidevice-page prefs="{{prefs}}">
</settings-multidevice-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPeople)]]"
restamp>
<page-displayer section="[[Section.kPeople]]">
<os-settings-people-page prefs="{{prefs}}">
</os-settings-people-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kKerberos)]]"
restamp>
<page-displayer section="[[Section.kKerberos]]">
<settings-kerberos-page></settings-kerberos-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kDevice)]]"
restamp>
<page-displayer section="[[Section.kDevice]]">
<settings-device-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</settings-device-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPersonalization)]]"
restamp>
<page-displayer section="[[Section.kPersonalization]]">
<settings-personalization-page prefs="{{prefs}}">
</settings-personalization-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPrivacyAndSecurity)]]"
restamp>
<page-displayer section="[[Section.kPrivacyAndSecurity]]">
<os-settings-privacy-page prefs="{{prefs}}">
</os-settings-privacy-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kApps)]]"
restamp>
<page-displayer section="[[Section.kApps]]">
<os-settings-apps-page
prefs="{{prefs}}"
android-apps-info="[[androidAppsInfo]]">
</os-settings-apps-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kAccessibility)]]"
restamp>
<page-displayer section="[[Section.kAccessibility]]">
<os-settings-a11y-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</os-settings-a11y-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kSystemPreferences)]]"
restamp>
<page-displayer section="[[Section.kSystemPreferences]]">
<settings-system-preferences-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</settings-system-preferences-page>
</page-displayer>
</template>
</div>

<settings-idle-load id="advancedPageTemplate">
<template>
<div id="aboutPageContainer"
hidden$="[[!shouldShowAboutPageContainer_]]">
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kAboutChromeOs)]]"
restamp>
<page-displayer section="[[Section.kAboutChromeOs]]">
<os-about-page prefs="{{prefs}}"></os-about-page>
</page-displayer>
</template>
</template>
<template is="dom-if" if="[[computeShowEolIncentive_(isShowingSubpage_,
showEolIncentive_)]]">
<eol-offer-section should-show-offer-text="[[shouldShowOfferText_]]">
</eol-offer-section>
</template>
<div id="secondaryUserBanner" class="settings-box two-line banner"
hidden="[[!showSecondaryUserBanner_]]">
<div id="secondaryUserIcon">
<iron-icon icon="os-settings:social-group"></iron-icon>
</div>
<div class="flex">$i18n{secondaryUserBannerText}</div>
</div>

<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kNetwork)]]"
restamp>
<page-displayer section="[[Section.kNetwork]]">
<settings-internet-page prefs="{{prefs}}">
</settings-internet-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kBluetooth)]]"
restamp>
<page-displayer section="[[Section.kBluetooth]]">
<os-settings-bluetooth-page prefs="{{prefs}}">
</os-settings-bluetooth-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kMultiDevice)]]"
restamp>
<page-displayer section="[[Section.kMultiDevice]]">
<settings-multidevice-page prefs="{{prefs}}">
</settings-multidevice-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPeople)]]"
restamp>
<page-displayer section="[[Section.kPeople]]">
<os-settings-people-page prefs="{{prefs}}">
</os-settings-people-page>
</page-displayer>
</template>
</settings-idle-load>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kKerberos)]]"
restamp>
<page-displayer section="[[Section.kKerberos]]">
<settings-kerberos-page></settings-kerberos-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kDevice)]]"
restamp>
<page-displayer section="[[Section.kDevice]]">
<settings-device-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</settings-device-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPersonalization)]]"
restamp>
<page-displayer section="[[Section.kPersonalization]]">
<settings-personalization-page prefs="{{prefs}}">
</settings-personalization-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kPrivacyAndSecurity)]]"
restamp>
<page-displayer section="[[Section.kPrivacyAndSecurity]]">
<os-settings-privacy-page prefs="{{prefs}}">
</os-settings-privacy-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kApps)]]"
restamp>
<page-displayer section="[[Section.kApps]]">
<os-settings-apps-page
prefs="{{prefs}}"
android-apps-info="[[androidAppsInfo]]">
</os-settings-apps-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kAccessibility)]]"
restamp>
<page-displayer section="[[Section.kAccessibility]]">
<os-settings-a11y-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</os-settings-a11y-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kSystemPreferences)]]"
restamp>
<page-displayer section="[[Section.kSystemPreferences]]">
<settings-system-preferences-page prefs="{{prefs}}"
languages="[[languages_]]"
language-helper="[[languageHelper_]]">
</settings-system-preferences-page>
</page-displayer>
</template>
<template is="dom-if"
if="[[shouldStampPage_(pageAvailability, Section.kAboutChromeOs)]]"
restamp>
<page-displayer section="[[Section.kAboutChromeOs]]">
<os-about-page prefs="{{prefs}}"></os-about-page>
</page-displayer>
</template>
</div>
34 changes: 3 additions & 31 deletions chrome/browser/resources/ash/settings/main_page_container/main_page_container.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@

/**
* @fileoverview
* 'main-page-container' is the container hosting all the
* main (top-level) pages, including advanced pages.
* 'main-page-container' is the container hosting all the top-level pages.
*/

/**
* All top-level basic pages should be imported below. Top-level advanced pages
* should be imported in lazy_load.ts instead.
* All top-level basic pages should be imported below.
*/
// clang-format off
import '../device_page/device_page.js';
import '../internet_page/internet_page.js';
import '../kerberos_page/kerberos_page.js';
import '../multidevice_page/multidevice_page.js';
import '../os_a11y_page/os_a11y_page.js';
import '../os_about_page/os_about_page.js';
import '../os_apps_page/os_apps_page.js';
import '../os_bluetooth_page/os_bluetooth_page.js';
import '../os_people_page/os_people_page.js';
Expand All @@ -34,7 +33,6 @@ import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
import '../os_about_page/eol_offer_section.js';
import '../os_languages_page/languages.js';
import '../os_settings_icons.html.js';
import '../os_settings_page/settings_idle_load.js';
import './page_displayer.js';

import {WebUiListenerMixin} from 'chrome://resources/ash/common/cr_elements/web_ui_listener_mixin.js';
Expand All @@ -50,7 +48,6 @@ import {AndroidAppsBrowserProxyImpl} from '../os_apps_page/android_apps_browser_
import type {LanguageHelper, LanguagesModel} from '../os_languages_page/languages_types.js';
import type {OsPageAvailability} from '../os_page_availability.js';
import type {Route} from '../router.js';
import {isAboutRoute, isBasicRoute, Router} from '../router.js';

import {getTemplate} from './main_page_container.html.js';
import {MainPageMixin} from './main_page_mixin.js';
Expand Down Expand Up @@ -133,16 +130,6 @@ export class MainPageContainerElement extends MainPageContainerElementBase {
value: false,
},

shouldShowBasicPageContainer_: {
type: Boolean,
computed: 'computeShouldShowBasicPageContainer_(currentRoute_)',
},

shouldShowAboutPageContainer_: {
type: Boolean,
computed: 'computeShouldShowAboutPageContainer_(currentRoute_)',
},

/**
* This is used to cache the set of languages from <settings-languages>
* via bi-directional data-binding.
Expand All @@ -168,11 +155,8 @@ export class MainPageContainerElement extends MainPageContainerElementBase {
private isShowingSubpage_: boolean;
private showSecondaryUserBanner_: boolean;
private showUpdateRequiredEolBanner_: boolean;
private currentRoute_: Route|null;
private showEolIncentive_: boolean;
private shouldShowOfferText_: boolean;
private shouldShowBasicPageContainer_: boolean;
private shouldShowAboutPageContainer_: boolean;

override ready(): void {
super.ready();
Expand All @@ -184,8 +168,6 @@ export class MainPageContainerElement extends MainPageContainerElementBase {
override connectedCallback(): void {
super.connectedCallback();

this.currentRoute_ = Router.getInstance().currentRoute;

this.addWebUiListener(
'android-apps-info-update', this.androidAppsInfoUpdate_.bind(this));
AndroidAppsBrowserProxyImpl.getInstance().requestAndroidAppsInfo();
Expand All @@ -198,8 +180,6 @@ export class MainPageContainerElement extends MainPageContainerElementBase {
}

override currentRouteChanged(newRoute: Route, oldRoute?: Route): void {
this.currentRoute_ = newRoute;

if (oldRoute?.isSubpage()) {
// If the new route isn't the same expanded section, reset
// isShowingSubpage_ for the next transition.
Expand Down Expand Up @@ -255,14 +235,6 @@ export class MainPageContainerElement extends MainPageContainerElementBase {
this.isShowingSubpage_ = true;
}

private computeShouldShowBasicPageContainer_(): boolean {
return isBasicRoute(this.currentRoute_);
}

private computeShouldShowAboutPageContainer_(): boolean {
return isAboutRoute(this.currentRoute_);
}

/**
* @param opened Whether the menu is expanded.
* @return Icon name.
Expand Down
Loading

0 comments on commit 1002647

Please sign in to comment.