Cleanup Tool WebUI: Add logs upload checkbox and minor polishing

chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.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.
 
 /**
  * The reason why the controller is in state kIdle.
  * Must be kept in sync with ChromeCleanerController::IdleReason.
  * @enum {string}
  */
 settings.ChromeCleanupIdleReason = {
@@ skipping 48 matching lines @@
       value: '',
     },
 
     /** @private */
     showDetails_: {
       type: Boolean,
       value: false,
     },
 
     /** @private */
-    detailsDescription: {
-      type: String,
-      value: '',
+    showLogsPermission_: {
+      type: Boolean,
+      value: false,
     },
 
     /** @private */
     showFilesToRemove_: {
       type: Boolean,
       value: false,
     },
 
     /** @private */
     filesToRemove_: {
       type: Array,
       value: [],
     },
 
     /** @private */
     statusIcon_: {
       type: String,
       value: '',
     },
 
     /** @private */
     statusIconClassName_: {
       type: String,
       value: '',
     },
+
+    /** @private {chrome.settingsPrivate.PrefObject} */
+    logsUploadPref_: {
+      type: Object,
+      value: function() {
+        return /** @type {chrome.settingsPrivate.PrefObject} */ ({});

[ftirelo, 2017/07/05 19:02:25]

Are () required here?

[proberge, 2017/07/05 20:14:20]

Maybe not, but all examples I could find do:
https://cs.chromium.org/search/?q=return.*chrome.settingsPrivate.PrefObject+l...

+      },
+    },
   },
 
   /** @private {?settings.ChromeCleanupProxy} */
   browserProxy_: null,
 
   /** @private {?function()} */
   doAction_: null,
 
   /**
    * If true, this settings page is waiting for cleanup results.
    * @private {boolean}
    */
   waitingForCleanupResults_: false,
 
   /** @override */
   attached: function() {
     this.browserProxy_ = settings.ChromeCleanupProxyImpl.getInstance();
 
     this.addWebUIListener('chrome-cleanup-on-idle', this.onIdle_.bind(this));
     this.addWebUIListener(
         'chrome-cleanup-on-scanning', this.onScanning_.bind(this));
     this.addWebUIListener(
         'chrome-cleanup-on-infected', this.onInfected_.bind(this));
     this.addWebUIListener(
         'chrome-cleanup-on-cleaning', this.onCleaning_.bind(this));
     this.addWebUIListener(
         'chrome-cleanup-on-reboot-required', this.onRebootRequired_.bind(this));
     this.addWebUIListener(
         'chrome-cleanup-on-dismiss', this.onDismiss_.bind(this));
+    this.addWebUIListener(
+        'chrome-cleanup-upload-permission-change',
+        this.onUploadPermissionChange_.bind(this));
 
     this.browserProxy_.registerChromeCleanerObserver();
   },
 
   /**
    * Implements the action for the only visible button in the UI, which can be
    * either to start a cleanup or to restart the computer.
    * @private
    */
   proceed_: function() {
@@ skipping 71 matching lines @@
    * @param {!Array<!string>} files The list of files to present to the user.
    * @private
    */
   onCleaning_: function(files) {
     this.waitingForCleanupResults_ = true;
     this.title_ = this.i18n('chromeCleanupTitleRemoving');
     this.isRemoving_ = true;
     this.resetIcon_();
     this.disableActionButton_();
     this.enableDetails_(files);
+    this.showLogsPermission_ = false;
   },
 
   /**
    * Listener of event 'chrome-cleanup-on-reboot-required'.
    * No UI will be shown in the Settings page on that state, so we simply hide
    * the card and cleanup this element's fields.
    * @private
    */
   onRebootRequired_: function() {
     this.title_ = this.i18n('chromeCleanupTitleRestart');
     this.isRemoving_ = false;
     this.setIconWarning_();
     this.enableActionButton_(
         this.i18n('chromeCleanupRestartButtonLabel'),
         this.restartComputer_.bind(this));
     this.disableDetails_();
   },
 
   /**
    * Listener of event 'chrome-cleanup-dismiss'.
    * Hides the Cleanup card.
    * @private
    */
   onDismiss_: function() {
     this.fire('chrome-cleanup-dismissed');
   },
 
   /**
+   * @param {boolean} enabled Whether logs upload is enabled.
+   * @private
+   */
+  onUploadPermissionChange_: function(enabled) {
+    this.logsUploadPref_ = {
+      key: '',
+      type: chrome.settingsPrivate.PrefType.BOOLEAN,
+      value: enabled,
+    };
+  },
+
+  /**
+   * @param {boolean} enabled Whether to enable logs upload.
+   * @private
+   */
+  changeLogsPermission_: function(enabled) {
+    var enabled = this.$.logsUploadControl.checked;
+    this.browserProxy_.setLogsUploadPermission(enabled);
+  },
+
+  /**
    * Dismiss the card.
    * @private
    */
   dismiss_: function() {
     this.browserProxy_.dismissCleanupPage();
   },
 
   /**
    * Hides the action button in the card when no action is available.
    * @private
@@ skipping 16 matching lines @@
     this.actionButtonLabel_ = buttonLabel;
     this.doAction_ = action;
   },
 
   /**
    * Disables the details section on the card.
    * @private
    */
   disableDetails_: function() {
     this.showDetails_ = false;
-    this.detailsDescription = '';
+    this.showLogsPermission_ = false;
     this.showFilesToRemove_ = false;
     this.filesToRemove_ = [];
   },
 
   /**
    * Enables the details section on the card.
    * @param {!Array<!string>} files The list of files to present to the user.
    * @private
    */
   enableDetails_: function(files) {
     this.showDetails_ = true;
-    this.detailsDescription = this.i18n('chromeCleanupExplanation');
+    this.showLogsPermission_ = true;
     // Note: doesn't change the state of this.showFilesToRemove_.
     this.filesToRemove_ = files;
   },
 
   /**
    * Sends an action to the browser proxy to start the cleanup.
    * @private
    */
   startCleanup_: function() {
-    this.browserProxy_.startCleanup();
+    this.browserProxy_.startCleanup(this.$.logsUploadControl.checked);
   },
 
   /**
    * Sends an action to the browser proxy to restart the machine.
    * @private
    */
   restartComputer_: function() {
     this.browserProxy_.restartComputer();
   },
 
@@ skipping 27 matching lines @@
 
   /**
    * Resets the card's icon.
    * @private
    */
   resetIcon_: function() {
     this.statusIcon_ = '';
     this.statusIconClassName_ = '';
   },
 });