Commit b2208c13 authored by dpapad's avatar dpapad Committed by Commit Bot

Settings: Check-in chrome_cleanup_page/ Polymer3

Bug: 1069258
Change-Id: I80674d8534d9773ac9329fde6d931425f3e2b5e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154822
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarJohn Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760263}
parent 4191829c
...@@ -69,7 +69,6 @@ group("closure_compile") { ...@@ -69,7 +69,6 @@ group("closure_compile") {
"about_page:closure_compile", "about_page:closure_compile",
"appearance_page:closure_compile", "appearance_page:closure_compile",
"autofill_page:closure_compile", "autofill_page:closure_compile",
"basic_page:closure_compile",
"clear_browsing_data_dialog:closure_compile", "clear_browsing_data_dialog:closure_compile",
"controls:closure_compile", "controls:closure_compile",
"languages_page:closure_compile", "languages_page:closure_compile",
...@@ -85,7 +84,6 @@ group("closure_compile") { ...@@ -85,7 +84,6 @@ group("closure_compile") {
if (is_win) { if (is_win) {
deps += [ deps += [
"chrome_cleanup_page:closure_compile",
"incompatible_applications_page:closure_compile", "incompatible_applications_page:closure_compile",
] ]
} }
......
...@@ -6,24 +6,6 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -6,24 +6,6 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni") import("//tools/polymer/polymer.gni")
import("../settings.gni") import("../settings.gni")
js_type_check("closure_compile") {
deps = [ ":basic_page" ]
}
js_library("basic_page") {
deps = [
"..:page_visibility",
"..:route",
"..:router",
"..:search_settings",
"../chrome_cleanup_page:chrome_cleanup_proxy",
"../prefs:prefs_behavior",
"../settings_page:main_page_behavior",
"//ui/webui/resources/js:load_time_data",
]
externs_list = [ "$externs_path/pending_polymer.js" ]
}
js_type_check("closure_compile_module") { js_type_check("closure_compile_module") {
is_polymer3 = true is_polymer3 = true
deps = [ ":basic_page.m" ] deps = [ ":basic_page.m" ]
...@@ -36,7 +18,7 @@ js_library("basic_page.m") { ...@@ -36,7 +18,7 @@ js_library("basic_page.m") {
"..:route.m", "..:route.m",
"..:router.m", "..:router.m",
"..:search_settings.m", "..:search_settings.m",
"../chrome_cleanup_page:chrome_cleanup_proxy.m", "../chrome_cleanup_page:chrome_cleanup_proxy",
"../prefs:prefs_behavior.m", "../prefs:prefs_behavior.m",
"../settings_page:main_page_behavior.m", "../settings_page:main_page_behavior.m",
"//ui/webui/resources/js:load_time_data.m", "//ui/webui/resources/js:load_time_data.m",
......
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni") import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
import("../settings.gni") import("../settings.gni")
js_type_check("closure_compile") { js_type_check("closure_compile_module") {
is_polymer3 = true
closure_flags = settings_closure_flags
deps = [ deps = [
":chrome_cleanup_page", ":chrome_cleanup_page",
":chrome_cleanup_proxy", ":chrome_cleanup_proxy",
...@@ -15,103 +16,44 @@ js_type_check("closure_compile") { ...@@ -15,103 +16,44 @@ js_type_check("closure_compile") {
] ]
} }
js_library("chrome_cleanup_proxy") {
deps = [
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
]
}
js_library("chrome_cleanup_page") { js_library("chrome_cleanup_page") {
deps = [ deps = [
":chrome_cleanup_proxy", ":chrome_cleanup_proxy",
"//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button", ":items_to_remove_list",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:util",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_library("items_to_remove_list") {
deps = [
":chrome_cleanup_proxy",
"//ui/webui/resources/js:cr",
]
}
js_type_check("closure_compile_module") {
is_polymer3 = true
deps = [
":chrome_cleanup_page.m",
":chrome_cleanup_proxy.m",
":items_to_remove_list.m",
]
}
js_library("chrome_cleanup_page.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.m.js" ]
deps = [
":chrome_cleanup_proxy.m",
":items_to_remove_list.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:assert.m", "//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:i18n_behavior.m", "//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m", "//ui/webui/resources/js:web_ui_listener_behavior.m",
] ]
extra_deps = [ ":chrome_cleanup_page_module" ]
externs_list = [ "$externs_path/settings_private.js" ] externs_list = [ "$externs_path/settings_private.js" ]
} }
js_library("chrome_cleanup_proxy.m") { js_library("chrome_cleanup_proxy") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.m.js" ]
deps = [ "//ui/webui/resources/js:cr.m" ] deps = [ "//ui/webui/resources/js:cr.m" ]
extra_deps = [ ":modulize" ]
} }
js_library("items_to_remove_list.m") { js_library("items_to_remove_list") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.m.js" ]
deps = [ deps = [
":chrome_cleanup_proxy.m", ":chrome_cleanup_proxy",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
] ]
extra_deps = [ ":items_to_remove_list_module" ]
} }
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ public_deps = [
":chrome_cleanup_page_module", ":chrome_cleanup_page_module",
":items_to_remove_list_module", ":items_to_remove_list_module",
":modulize",
] ]
} }
polymer_modulizer("chrome_cleanup_page") { polymer_modulizer("chrome_cleanup_page") {
js_file = "chrome_cleanup_page.js" js_file = "chrome_cleanup_page.js"
html_file = "chrome_cleanup_page.html" html_file = "chrome_cleanup_page.html"
html_type = "dom-module" html_type = "v3-ready"
namespace_rewrites = settings_namespace_rewrites + [
"settings.ChromeCleaner|ChromeCleaner",
"settings.ChromeCleanup|ChromeCleanup",
]
auto_imports = [
"ui/webui/resources/html/assert.html|assert",
"chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.html|ChromeCleanupProxyImpl,ChromeCleanupProxy",
"chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html|ChromeCleanupRemovalListItem",
]
} }
polymer_modulizer("items_to_remove_list") { polymer_modulizer("items_to_remove_list") {
js_file = "items_to_remove_list.js" js_file = "items_to_remove_list.js"
html_file = "items_to_remove_list.html" html_file = "items_to_remove_list.html"
html_type = "dom-module" html_type = "v3-ready"
namespace_rewrites = settings_namespace_rewrites
auto_imports = [ "chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.html|ChromeCleanupProxyImpl" ]
}
js_modulizer("modulize") {
input_files = [ "chrome_cleanup_proxy.js" ]
namespace_rewrites = settings_namespace_rewrites
} }
<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_expand_button/cr_expand_button.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../controls/controlled_button.html">
<link rel="import" href="../controls/settings_checkbox.html">
<link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="chrome_cleanup_proxy.html">
<link rel="import" href="items_to_remove_list.html">
<dom-module id="settings-chrome-cleanup-page">
<template>
<style include="settings-shared"> <style include="settings-shared">
#status-title { #status-title {
font-weight: 500; font-weight: 500;
...@@ -118,6 +97,3 @@ ...@@ -118,6 +97,3 @@
</div> </div>
</div> </div>
</iron-collapse> </iron-collapse>
</template>
<script src="chrome_cleanup_page.js"></script>
</dom-module>
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome_cleanup_proxy.js"></script>
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off // clang-format off
// #import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js'; import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
// clang-format on // clang-format on
cr.define('settings', function() {
/** @interface */ /** @interface */
/* #export */ class ChromeCleanupProxy { export class ChromeCleanupProxy {
/** /**
* Registers the current ChromeCleanupHandler as an observer of * Registers the current ChromeCleanupHandler as an observer of
* ChromeCleanerController events. * ChromeCleanerController events.
...@@ -61,9 +60,9 @@ cr.define('settings', function() { ...@@ -61,9 +60,9 @@ cr.define('settings', function() {
} }
/** /**
* @implements {settings.ChromeCleanupProxy} * @implements {ChromeCleanupProxy}
*/ */
/* #export */ class ChromeCleanupProxyImpl { export class ChromeCleanupProxyImpl {
/** @override */ /** @override */
registerChromeCleanerObserver() { registerChromeCleanerObserver() {
chrome.send('registerChromeCleanerObserver'); chrome.send('registerChromeCleanerObserver');
...@@ -96,20 +95,13 @@ cr.define('settings', function() { ...@@ -96,20 +95,13 @@ cr.define('settings', function() {
/** @override */ /** @override */
getMoreItemsPluralString(numHiddenItems) { getMoreItemsPluralString(numHiddenItems) {
return cr.sendWithPromise('getMoreItemsPluralString', numHiddenItems); return sendWithPromise('getMoreItemsPluralString', numHiddenItems);
} }
/** @override */ /** @override */
getItemsToRemovePluralString(numItems) { getItemsToRemovePluralString(numItems) {
return cr.sendWithPromise('getItemsToRemovePluralString', numItems); return sendWithPromise('getItemsToRemovePluralString', numItems);
} }
} }
cr.addSingletonGetter(ChromeCleanupProxyImpl); addSingletonGetter(ChromeCleanupProxyImpl);
// #cr_define_end
return {
ChromeCleanupProxy: ChromeCleanupProxy,
ChromeCleanupProxyImpl: ChromeCleanupProxyImpl,
};
});
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/util.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="chrome_cleanup_proxy.html">
<dom-module id="items-to-remove-list">
<template>
<style include="settings-shared"> <style include="settings-shared">
:host { :host {
display: block; display: block;
...@@ -63,6 +53,3 @@ ...@@ -63,6 +53,3 @@
</li> </li>
</template> </template>
</ul> </ul>
</template>
<script src="items_to_remove_list.js"></script>
</dom-module>
...@@ -2,7 +2,14 @@ ...@@ -2,7 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
cr.define('settings', function() { import 'chrome://resources/cr_elements/shared_vars_css.m.js';
import 'chrome://resources/polymer/v3_0/paper-styles/color.js';
import '../settings_shared_css.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {ChromeCleanupProxyImpl} from './chrome_cleanup_proxy.js';
/** /**
* For each line in the item list, the text field will be shown in normal * For each line in the item list, the text field will be shown in normal
* style at front of the line. The highlightSuffix will be appended to the end * style at front of the line. The highlightSuffix will be appended to the end
...@@ -12,13 +19,13 @@ cr.define('settings', function() { ...@@ -12,13 +19,13 @@ cr.define('settings', function() {
* highlightSuffix: ?string, * highlightSuffix: ?string,
* }} * }}
*/ */
/* #export */ let ChromeCleanupRemovalListItem; export let ChromeCleanupRemovalListItem;
/** /**
* The default number of items to show for files, registry keys and extensions * The default number of items to show for files, registry keys and extensions
* on the detailed view when user-initiated cleanups are enabled. * on the detailed view when user-initiated cleanups are enabled.
*/ */
/* #export */ const CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW = 4; export const CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW = 4;
/** /**
* @fileoverview * @fileoverview
...@@ -41,13 +48,15 @@ cr.define('settings', function() { ...@@ -41,13 +48,15 @@ cr.define('settings', function() {
Polymer({ Polymer({
is: 'items-to-remove-list', is: 'items-to-remove-list',
_template: html`{__html_template__}`,
properties: { properties: {
title: { title: {
type: String, type: String,
value: '', value: '',
}, },
/** @type {!Array<settings.ChromeCleanupRemovalListItem>} */ /** @type {!Array<ChromeCleanupRemovalListItem>} */
itemsToShow: { itemsToShow: {
type: Array, type: Array,
observer: 'updateVisibleState_', observer: 'updateVisibleState_',
...@@ -65,7 +74,7 @@ cr.define('settings', function() { ...@@ -65,7 +74,7 @@ cr.define('settings', function() {
/** /**
* The first |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW| items of |itemsToShow| * The first |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW| items of |itemsToShow|
* if the list is longer than |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW|. * if the list is longer than |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW|.
* @private {?Array<settings.ChromeCleanupRemovalListItem>} * @private {?Array<ChromeCleanupRemovalListItem>}
*/ */
initialItems_: Array, initialItems_: Array,
...@@ -73,7 +82,7 @@ cr.define('settings', function() { ...@@ -73,7 +82,7 @@ cr.define('settings', function() {
* The remaining items to be presented that are not included in * The remaining items to be presented that are not included in
* |initialItems_|. Items in this list are only shown to the user if * |initialItems_|. Items in this list are only shown to the user if
* |expanded_| is true. * |expanded_| is true.
* @private {?Array<settings.ChromeCleanupRemovalListItem>} * @private {?Array<ChromeCleanupRemovalListItem>}
*/ */
remainingItems_: Array, remainingItems_: Array,
...@@ -105,13 +114,12 @@ cr.define('settings', function() { ...@@ -105,13 +114,12 @@ cr.define('settings', function() {
* to the user will contain exactly |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW| * to the user will contain exactly |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW|
* elements, and the last one will be the "show more" link. * elements, and the last one will be the "show more" link.
* *
* @param {!Array<settings.ChromeCleanupRemovalListItem>} itemsToShow * @param {!Array<ChromeCleanupRemovalListItem>} itemsToShow
*/ */
updateVisibleState_(itemsToShow) { updateVisibleState_(itemsToShow) {
// Start expanded if there are less than // Start expanded if there are less than
// |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW| items to show. // |CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW| items to show.
this.expanded_ = this.expanded_ = itemsToShow.length <= CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW;
itemsToShow.length <= CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW;
if (this.expanded_) { if (this.expanded_) {
this.initialItems_ = itemsToShow; this.initialItems_ = itemsToShow;
...@@ -125,7 +133,7 @@ cr.define('settings', function() { ...@@ -125,7 +133,7 @@ cr.define('settings', function() {
this.remainingItems_ = this.remainingItems_ =
itemsToShow.slice(CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW - 1); itemsToShow.slice(CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW - 1);
const browserProxy = settings.ChromeCleanupProxyImpl.getInstance(); const browserProxy = ChromeCleanupProxyImpl.getInstance();
browserProxy.getMoreItemsPluralString(this.remainingItems_.length) browserProxy.getMoreItemsPluralString(this.remainingItems_.length)
.then(linkText => { .then(linkText => {
this.moreItemsLinkText_ = linkText; this.moreItemsLinkText_ = linkText;
...@@ -142,7 +150,7 @@ cr.define('settings', function() { ...@@ -142,7 +150,7 @@ cr.define('settings', function() {
}, },
/** /**
* @param {settings.ChromeCleanupRemovalListItem} item * @param {ChromeCleanupRemovalListItem} item
* @return {boolean} Whether a highlight suffix exists. * @return {boolean} Whether a highlight suffix exists.
* @private * @private
*/ */
...@@ -150,7 +158,3 @@ cr.define('settings', function() { ...@@ -150,7 +158,3 @@ cr.define('settings', function() {
return item.highlightSuffix !== null; return item.highlightSuffix !== null;
}, },
}); });
// #cr_define_end
return {ChromeCleanupRemovalListItem, CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW};
});
...@@ -58,9 +58,9 @@ export {BlockingRequestManager} from './autofill_page/blocking_request_manager.m ...@@ -58,9 +58,9 @@ export {BlockingRequestManager} from './autofill_page/blocking_request_manager.m
// </if> // </if>
export {PaymentsManagerImpl} from './autofill_page/payments_section.m.js'; export {PaymentsManagerImpl} from './autofill_page/payments_section.m.js';
// <if expr="_google_chrome and is_win"> // <if expr="_google_chrome and is_win">
export {ChromeCleanupIdleReason} from './chrome_cleanup_page/chrome_cleanup_page.m.js'; export {ChromeCleanupIdleReason} from './chrome_cleanup_page/chrome_cleanup_page.js';
export {ChromeCleanupProxyImpl} from './chrome_cleanup_page/chrome_cleanup_proxy.m.js'; export {ChromeCleanupProxyImpl} from './chrome_cleanup_page/chrome_cleanup_proxy.js';
export {CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW} from './chrome_cleanup_page/items_to_remove_list.m.js'; export {CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW} from './chrome_cleanup_page/items_to_remove_list.js';
// </if> // </if>
export {ClearBrowsingDataBrowserProxyImpl} from './clear_browsing_data_dialog/clear_browsing_data_browser_proxy.m.js'; export {ClearBrowsingDataBrowserProxyImpl} from './clear_browsing_data_dialog/clear_browsing_data_browser_proxy.m.js';
export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_browser_proxy.js'; export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_browser_proxy.js';
......
...@@ -13,7 +13,7 @@ import '../settings_page/settings_animated_pages.m.js'; ...@@ -13,7 +13,7 @@ import '../settings_page/settings_animated_pages.m.js';
import '../settings_shared_css.m.js'; import '../settings_shared_css.m.js';
// <if expr="_google_chrome and is_win"> // <if expr="_google_chrome and is_win">
import '../chrome_cleanup_page/chrome_cleanup_page.m.js'; import '../chrome_cleanup_page/chrome_cleanup_page.js';
import '../incompatible_applications_page/incompatible_applications_page.m.js'; import '../incompatible_applications_page/incompatible_applications_page.m.js';
// </if> // </if>
......
...@@ -147,17 +147,16 @@ ...@@ -147,17 +147,16 @@
compress="false" type="BINDATA" compress="false" type="BINDATA"
preprocess="true" /> preprocess="true" />
<if expr="is_win"> <if expr="is_win">
<include name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_M_JS" <include name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.m.js" file="chrome_cleanup_page/chrome_cleanup_proxy.js"
use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_M_JS" <include name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" compress="false" type="BINDATA"
preprocess="true" /> preprocess="true" />
<include name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_M_JS" <include name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
</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