SplitSettings: More cleanup of about page

- Delete powerwash dialog from browser settings
- Remove settings animated pages, main page behavior, and route
  observer behavior from browser about page

Bug: 990170
Change-Id: I1f2f0a1eb454d55c8f84b7374c7be4e66b238ea2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1979082
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727019}

chrome/browser/resources/settings/about_page/BUILD.gn

@@ -16,8 +16,6 @@ js_library("about_page") {
     ":about_page_browser_proxy",
     "..:lifetime_browser_proxy",
     "..:route",
-    "../settings_page:main_page_behavior",
-    "../settings_page:settings_animated_pages",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:parse_html_subset",

chrome/browser/resources/settings/about_page/about_page.html

@@ -6,8 +6,6 @@
 <link rel="import" href="../lifetime_browser_proxy.html">
 <link rel="import" href="../prefs/prefs.html">
 <link rel="import" href="../route.html">
-<link rel="import" href="../settings_page/main_page_behavior.html">
-<link rel="import" href="../settings_page/settings_animated_pages.html">
 <link rel="import" href="../settings_page/settings_section.html">
 <link rel="import" href="../settings_page_css.html">
 <link rel="import" href="../settings_shared_css.html">
@@ -76,9 +74,6 @@
 </if>
     </style>
     <settings-section page-title="$i18n{aboutPageTitle}" section="about">
-      <settings-animated-pages id="pages" section="about"
-          focus-config="[[focusConfig_]]">
-        <div route-path="default">
       <div class="settings-box two-line first">
         <img id="product-logo" on-click="onProductLogoTap_"
             srcset="chrome://theme/current-channel-logo@1x 1x,
@@ -173,8 +168,6 @@
           start-icon="cr:domain" label="$i18n{managementPage}"
           role-description="$i18n{subpageArrowRoleDescription}"
           hidden$="[[!isManaged_]]"></cr-link-row>
-        </div>
-      </settings-animated-pages>
     </settings-section>
 
     <settings-section>

chrome/browser/resources/settings/about_page/about_page.js

@@ -12,8 +12,6 @@ Polymer({
 
   behaviors: [
     WebUIListenerBehavior,
-    settings.MainPageBehavior,
-    settings.RouteObserverBehavior,
     I18nBehavior,
   ],
 
@@ -107,20 +105,6 @@ Polymer({
     // </if>
   },
 
-  /**
-   * @param {!settings.Route} newRoute
-   * @param {settings.Route} oldRoute
-   */
-  currentRouteChanged: function(newRoute, oldRoute) {
-    settings.MainPageBehavior.currentRouteChanged.call(
-        this, newRoute, oldRoute);
-  },
-
-  // Override settings.MainPageBehavior method.
-  containsRoute: function(route) {
-    return !route || settings.routes.ABOUT.contains(route);
-  },
-
   // <if expr="not chromeos">
   /** @private */
   startListening_: function() {

chrome/browser/resources/settings/reset_page/powerwash_dialog.html

-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="../lifetime_browser_proxy.html">
-<link rel="import" href="reset_browser_proxy.html">
-<link rel="import" href="../settings_shared_css.html">
-
-<dom-module id="settings-powerwash-dialog">
-  <template>
-    <style include="settings-shared">
-    </style>
-    <cr-dialog id="dialog" close-text="$i18n{close}"
-        ignore-enter-key>
-      <div slot="title">$i18n{powerwashDialogTitle}</div>
-      <div slot="body">
-        <span>
-          $i18n{powerwashDialogExplanation}
-          <a href="$i18nRaw{powerwashLearnMoreUrl}" target="_blank">
-            $i18n{learnMore}
-          </a>
-        </span>
-      </div>
-      <div slot="button-container">
-        <cr-button class="cancel-button" on-click="onCancelTap_"
-            id="cancel">$i18n{cancel}</cr-button>
-        <cr-button class="action-button" id="powerwash"
-            on-click="onRestartTap_">$i18n{powerwashDialogButton}</cr-button>
-      </div>
-    </cr-dialog>
-  </template>
-  <script src="powerwash_dialog.js"></script>
-</dom-module>

chrome/browser/resources/settings/reset_page/powerwash_dialog.js

-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview
- * 'settings-powerwash-dialog' is a dialog shown to request confirmation from
- * the user for a device reset (aka powerwash).
- */
-Polymer({
-  is: 'settings-powerwash-dialog',
-
-  properties: {
-    /** @public */
-    requestTpmFirmwareUpdate: {
-      type: Boolean,
-      value: false,
-    }
-  },
-
-  /** @override */
-  attached: function() {
-    settings.ResetBrowserProxyImpl.getInstance().onPowerwashDialogShow();
-    this.$.dialog.showModal();
-  },
-
-  /** @private */
-  onCancelTap_: function() {
-    this.$.dialog.close();
-  },
-
-  /** @private */
-  onRestartTap_: function() {
-    settings.LifetimeBrowserProxyImpl.getInstance().factoryReset(
-        this.requestTpmFirmwareUpdate);
-  },
-});

chrome/browser/resources/settings/settings_resources.grd

@@ -548,12 +548,6 @@
                    flattenhtml="true"
                    type="chrome_html" />
       </if>
-      <structure name="IDR_SETTINGS_POWERWASH_DIALOG_HTML"
-                 file="reset_page/powerwash_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_POWERWASH_DIALOG_JS"
-                 file="reset_page/powerwash_dialog.js"
-                 type="chrome_html" />
       <structure name="IDR_SETTINGS_RESET_PAGE_HTML"
                  file="reset_page/reset_page.html"
                  type="chrome_html"