Commit 6f3a3a46 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

SplitSettings: Remove powerwash dialog from browser settings reset_page.

Not removing the files from settings_resources.grd yet, because they
are still referenced by about_page.html.

Bug: 990106
Change-Id: Ia030e2f5f71d6cd8b4fe276082c569d136e0b235
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977004
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726669}
parent 07da21f9
...@@ -10,17 +10,6 @@ js_type_check("closure_compile") { ...@@ -10,17 +10,6 @@ js_type_check("closure_compile") {
":reset_page", ":reset_page",
":reset_profile_dialog", ":reset_profile_dialog",
] ]
if (is_chromeos) {
deps += [ ":powerwash_dialog" ]
}
}
js_library("powerwash_dialog") {
deps = [
":reset_browser_proxy",
"..:lifetime_browser_proxy",
]
} }
js_library("reset_page") { js_library("reset_page") {
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
<link rel="import" href="../settings_page/settings_animated_pages.html"> <link rel="import" href="../settings_page/settings_animated_pages.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<if expr="chromeos">
<link rel="import" href="powerwash_dialog.html">
</if>
<if expr="_google_chrome and is_win"> <if expr="_google_chrome and is_win">
<link rel="import" href="../chrome_cleanup_page/chrome_cleanup_page.html"> <link rel="import" href="../chrome_cleanup_page/chrome_cleanup_page.html">
<link rel="import" href="../incompatible_applications_page/incompatible_applications_page.html"> <link rel="import" href="../incompatible_applications_page/incompatible_applications_page.html">
...@@ -34,15 +30,6 @@ ...@@ -34,15 +30,6 @@
</settings-reset-profile-dialog> </settings-reset-profile-dialog>
</template> </template>
</cr-lazy-render> </cr-lazy-render>
<if expr="chromeos">
<cr-link-row class="hr" hidden="[[!allowPowerwash_]]" id="powerwash"
label="$i18n{powerwashTitle}" on-click="onShowPowerwashDialog_"
sub-label="$i18n{powerwashDescription}"></cr-link-row>
<template is="dom-if" if="[[showPowerwashDialog_]]" restamp>
<settings-powerwash-dialog on-close="onPowerwashDialogClose_">
</settings-powerwash-dialog>
</template>
</if>
<if expr="_google_chrome and is_win"> <if expr="_google_chrome and is_win">
<cr-link-row class="hr" id="chromeCleanupSubpageTrigger" <cr-link-row class="hr" id="chromeCleanupSubpageTrigger"
label="$i18n{resetCleanupComputerTrigger}" label="$i18n{resetCleanupComputerTrigger}"
......
...@@ -6,14 +6,6 @@ ...@@ -6,14 +6,6 @@
* @fileoverview * @fileoverview
* 'settings-reset-page' is the settings page containing reset * 'settings-reset-page' is the settings page containing reset
* settings. * settings.
*
* Example:
*
* <iron-animated-pages>
* <settings-reset-page prefs="{{prefs}}">
* </settings-reset-page>
* ... other pages ...
* </iron-animated-pages>
*/ */
Polymer({ Polymer({
is: 'settings-reset-page', is: 'settings-reset-page',
...@@ -24,21 +16,6 @@ Polymer({ ...@@ -24,21 +16,6 @@ Polymer({
/** Preferences state. */ /** Preferences state. */
prefs: Object, prefs: Object,
// <if expr="chromeos">
/**
* Dictionary defining page visibility.
* @type {!ResetPageVisibility}
*/
pageVisibility: Object,
/** @private */
showPowerwashDialog_: Boolean,
/** @private */
allowPowerwash_: Boolean,
// </if>
// <if expr="_google_chrome and is_win"> // <if expr="_google_chrome and is_win">
/** @private */ /** @private */
showIncompatibleApplications_: { showIncompatibleApplications_: {
...@@ -50,15 +27,6 @@ Polymer({ ...@@ -50,15 +27,6 @@ Polymer({
// </if> // </if>
}, },
// <if expr="chromeos">
/** @override */
ready: function() {
// TODO(hsuregan): Remove when OS settings migration is complete.
this.allowPowerwash_ = loadTimeData.getBoolean('allowPowerwash') &&
this.pageVisibility.powerwash;
},
// </if>
/** /**
* settings.RouteObserverBehavior * settings.RouteObserverBehavior
* @param {!settings.Route} route * @param {!settings.Route} route
...@@ -93,23 +61,6 @@ Polymer({ ...@@ -93,23 +61,6 @@ Polymer({
cr.ui.focusWithoutInk(assert(this.$.resetProfile)); cr.ui.focusWithoutInk(assert(this.$.resetProfile));
}, },
// <if expr="chromeos">
/**
* @param {!Event} e
* @private
*/
onShowPowerwashDialog_: function(e) {
e.preventDefault();
this.showPowerwashDialog_ = true;
},
/** @private */
onPowerwashDialogClose_: function() {
this.showPowerwashDialog_ = false;
cr.ui.focusWithoutInk(assert(this.$.powerwash));
},
// </if>
// <if expr="_google_chrome and is_win"> // <if expr="_google_chrome and is_win">
/** @private */ /** @private */
onChromeCleanupTap_: function() { onChromeCleanupTap_: function() {
...@@ -121,5 +72,4 @@ Polymer({ ...@@ -121,5 +72,4 @@ Polymer({
settings.navigateTo(settings.routes.INCOMPATIBLE_APPLICATIONS); settings.navigateTo(settings.routes.INCOMPATIBLE_APPLICATIONS);
}, },
// </if> // </if>
}); });
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