summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/resources/settings/device_page
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 17:21:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 16:25:15 +0000
commitc551f43206405019121bd2b2c93714319a0a3300 (patch)
tree1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/chrome/browser/resources/settings/device_page
parent7961cea6d1041e3e454dae6a1da660b453efd238 (diff)
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/settings/device_page')
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/BUILD.gn8
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/display.html8
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.html31
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.js31
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/keyboard.js2
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/pointers.html4
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/storage.html19
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/storage.js56
-rw-r--r--chromium/chrome/browser/resources/settings/device_page/storage_external.html2
9 files changed, 8 insertions, 153 deletions
diff --git a/chromium/chrome/browser/resources/settings/device_page/BUILD.gn b/chromium/chrome/browser/resources/settings/device_page/BUILD.gn
index d7d0c1e13fd..1826cc4de8d 100644
--- a/chromium/chrome/browser/resources/settings/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/device_page/BUILD.gn
@@ -12,7 +12,6 @@ js_type_check("closure_compile") {
":display_layout",
":display_overscan_dialog",
":drag_behavior",
- ":drive_cache_dialog",
":keyboard",
":layout_behavior",
":night_light_slider",
@@ -148,10 +147,3 @@ js_library("storage") {
"//ui/webui/resources/js/cr/ui:focus_without_ink",
]
}
-
-js_library("drive_cache_dialog") {
- deps = [
- "//ui/webui/resources/js:i18n_behavior",
- ]
- externs_list = [ "$externs_path/chrome_send.js" ]
-}
diff --git a/chromium/chrome/browser/resources/settings/device_page/display.html b/chromium/chrome/browser/resources/settings/device_page/display.html
index 5b906f084eb..cee6fafa793 100644
--- a/chromium/chrome/browser/resources/settings/device_page/display.html
+++ b/chromium/chrome/browser/resources/settings/device_page/display.html
@@ -241,12 +241,13 @@
pref="{{prefs.ash.night_light.enabled}}"
sub-label="$i18n{displayNightLightText}">
</settings-toggle-button>
+
<div id="nightLightSettingsDiv"
class="settings-box continuation start layout vertical">
<!-- Color temperature slider -->
<div id="nightLightTemperatureDiv"
class="settings-box indented continuation"
- disabled$="[[!prefs.ash.night_light.enabled.value]]">
+ hidden$="[[!prefs.ash.night_light.enabled.value]]">
<div class="start text-area" id="colorTemperatureLabel">
$i18n{displayNightLightTemperatureLabel}
</div>
@@ -254,8 +255,7 @@
aria-labelledby="colorTemperatureLabel" min="0" max="100"
scale="100" label-min="$i18n{displayNightLightTempSliderMinLabel}"
label-max="$i18n{displayNightLightTempSliderMaxLabel}"
- pref="{{prefs.ash.night_light.color_temperature}}"
- disabled$="[[!prefs.ash.night_light.enabled.value]]">
+ pref="{{prefs.ash.night_light.color_temperature}}">
</settings-slider>
</div>
<!-- Schedule settings -->
@@ -278,7 +278,7 @@
</div>
<!-- Custom schedule slider -->
<iron-collapse id="nightLightCustomScheduleCollapse"
- opened="[[shouldOpenCustomScheduleCollapse_]]">
+ opened="[[shouldOpenCustomScheduleCollapse_]]">
<div class="settings-box indented continuation">
<div class="start text-area layout vertical">
<div class="settings-box continuation self-stretch">
diff --git a/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.html b/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.html
deleted file mode 100644
index 00e43a44464..00000000000
--- a/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<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="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="../settings_shared_css.html">
-
-<dom-module id="settings-drive-cache-dialog">
- <template>
- <style include="settings-shared"></style>
- <cr-dialog id="dialog" close-text="$i18n{close}">
- <div slot="title">
- $i18n{storageClearDriveCacheDialogTitle}
- </div>
- <div slot="body">
- <span>$i18n{storageClearDriveCacheDialogDescription}</span>
- </div>
- <div slot="button-container">
- <cr-button id="cancelButton" class="cancel-button"
- on-click="onCancelTap_">
- $i18n{cancel}
- </cr-button>
- <cr-button id="deleteButton" class="action-button"
- on-click="onDeleteTap_">
- $i18n{storageDeleteAllButtonTitle}
- </cr-button>
- </div>
- </cr-dialog>
- </template>
- <script src="drive_cache_dialog.js"></script>
-</dom-module>
diff --git a/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.js b/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.js
deleted file mode 100644
index fd63087ec6a..00000000000
--- a/chromium/chrome/browser/resources/settings/device_page/drive_cache_dialog.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 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-drive-cache-dialog' is the dialog to delete Google Drive temporary
- * offline files.
- */
-Polymer({
- is: 'settings-drive-cache-dialog',
-
- behaviors: [
- I18nBehavior,
- ],
-
- open: function() {
- this.$.dialog.showModal();
- },
-
- /** @private */
- onCancelTap_: function() {
- this.$.dialog.cancel();
- },
-
- /** @private */
- onDeleteTap_: function() {
- chrome.send('clearDriveCache');
- this.$.dialog.close();
- },
-});
diff --git a/chromium/chrome/browser/resources/settings/device_page/keyboard.js b/chromium/chrome/browser/resources/settings/device_page/keyboard.js
index 4c189aa6727..a636592e369 100644
--- a/chromium/chrome/browser/resources/settings/device_page/keyboard.js
+++ b/chromium/chrome/browser/resources/settings/device_page/keyboard.js
@@ -155,7 +155,7 @@ Polymer({
onShowLanguageInputTap_: function() {
settings.navigateTo(
- settings.routes.LANGUAGES,
+ settings.routes.LANGUAGES_DETAILS,
/* dynamicParams */ null, /* removeSearch */ true);
},
diff --git a/chromium/chrome/browser/resources/settings/device_page/pointers.html b/chromium/chrome/browser/resources/settings/device_page/pointers.html
index fff070da29c..6a628f2f5b2 100644
--- a/chromium/chrome/browser/resources/settings/device_page/pointers.html
+++ b/chromium/chrome/browser/resources/settings/device_page/pointers.html
@@ -46,7 +46,7 @@
<template is="dom-if" if="[[allowDisableAcceleration_]]">
<settings-toggle-button id="mouseAcceleration"
pref="{{prefs.settings.mouse.acceleration}}"
- label="$i18n{pointerAccelerationLabel}">
+ label="$i18n{mouseAccelerationLabel}">
</settings-toggle-button>
</template>
<div class="settings-box">
@@ -75,7 +75,7 @@
<template is="dom-if" if="[[allowDisableAcceleration_]]">
<settings-toggle-button id="touchpadAcceleration"
pref="{{prefs.settings.touchpad.acceleration}}"
- label="$i18n{pointerAccelerationLabel}">
+ label="$i18n{touchpadAccelerationLabel}">
</settings-toggle-button>
</template>
<div class="settings-box">
diff --git a/chromium/chrome/browser/resources/settings/device_page/storage.html b/chromium/chrome/browser/resources/settings/device_page/storage.html
index f0a518e2572..6526d4f1fb1 100644
--- a/chromium/chrome/browser/resources/settings/device_page/storage.html
+++ b/chromium/chrome/browser/resources/settings/device_page/storage.html
@@ -8,7 +8,6 @@
<link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="drive_cache_dialog.html">
<link rel="import" href="storage_external.html">
<link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../route.html">
@@ -201,20 +200,6 @@
<cr-link-row id="downloadsSize" class="hr" on-click="onDownloadsTap_"
label="$i18n{storageItemDownloads}"
sub-label="$i18n{storageSizeComputing}" external></cr-link-row>
- <template is="dom-if" if="[[driveEnabled_]]">
- <div class="settings-box two-line" on-click="onDriveCacheTap_"
- actionable$="[[hasDriveCache_]]" >
- <div class="start">
- $i18n{storageItemDriveCache}
- <div id="driveCacheSize" class="secondary">
- $i18n{storageSizeComputing}
- </div>
- </div>
- <cr-icon-button class="icon-delete-gray" id="deleteButton"
- aria-label="$i18n{storageItemDriveCache}"
- aria-describedby="driveSizeCache"></cr-icon-button>
- </div>
- </template>
<cr-link-row id="browsingDataSize" class="hr" on-click="onBrowsingDataTap_"
label="$i18n{storageItemBrowsingData}"
sub-label="$i18n{storageSizeComputing}" external></cr-link-row>
@@ -238,10 +223,6 @@
on-click="onExternalStoragePreferencesTap_"
label="$i18n{storageExternal}"></cr-link-row>
</template>
-
- <settings-drive-cache-dialog id="storageDriveCache"
- on-close="onCloseDriveCacheDialog_">
- </settings-drive-cache-dialog>
</template>
<script src="storage.js"></script>
</dom-module>
diff --git a/chromium/chrome/browser/resources/settings/device_page/storage.js b/chromium/chrome/browser/resources/settings/device_page/storage.js
index 2717462da66..ae7598fdbba 100644
--- a/chromium/chrome/browser/resources/settings/device_page/storage.js
+++ b/chromium/chrome/browser/resources/settings/device_page/storage.js
@@ -37,12 +37,6 @@ Polymer({
behaviors: [settings.RouteObserverBehavior, WebUIListenerBehavior],
properties: {
- /** @private */
- driveEnabled_: {
- type: Boolean,
- value: false,
- },
-
androidEnabled: Boolean,
/** @private */
@@ -68,12 +62,6 @@ Polymer({
}
},
- /** @private */
- hasDriveCache_: {
- type: Boolean,
- value: false,
- },
-
/** @private {settings.StorageSizeStat} */
sizeStat_: Object,
},
@@ -94,9 +82,6 @@ Polymer({
'storage-downloads-size-changed',
this.handleDownloadsSizeChanged_.bind(this));
this.addWebUIListener(
- 'storage-drive-cache-size-changed',
- this.handleDriveCacheSizeChanged_.bind(this));
- this.addWebUIListener(
'storage-browsing-data-size-changed',
this.handleBrowsingDataSizeChanged_.bind(this));
this.addWebUIListener(
@@ -111,9 +96,6 @@ Polymer({
this.handleOtherUsersSizeChanged_.bind(this));
}
this.addWebUIListener(
- 'storage-drive-enabled-changed',
- this.handleDriveEnabledChanged_.bind(this));
- this.addWebUIListener(
'storage-android-running-changed',
this.handleAndroidRunningChanged_.bind(this));
},
@@ -146,18 +128,6 @@ Polymer({
},
/**
- * Handler for tapping the "Offline files" item.
- * @param {!Event} e
- * @private
- */
- onDriveCacheTap_: function(e) {
- e.preventDefault();
- if (this.hasDriveCache_) {
- this.$.storageDriveCache.open();
- }
- },
-
- /**
* Handler for tapping the "Browsing data" item.
* @private
*/
@@ -221,19 +191,6 @@ Polymer({
},
/**
- * @param {string} size Formatted string representing the size of Offline
- * files.
- * @param {boolean} hasCache True if the device has at least one offline file.
- * @private
- */
- handleDriveCacheSizeChanged_: function(size, hasCache) {
- if (this.driveEnabled_) {
- this.$$('#driveCacheSize').textContent = size;
- this.hasDriveCache_ = hasCache;
- }
- },
-
- /**
* @param {string} size Formatted string representing the size of Browsing
* data.
* @private
@@ -275,14 +232,6 @@ Polymer({
},
/**
- * @param {boolean} enabled True if Google Drive is enabled.
- * @private
- */
- handleDriveEnabledChanged_: function(enabled) {
- this.driveEnabled_ = enabled;
- },
-
- /**
* @param {boolean} running True if Android (ARC) is running.
* @private
*/
@@ -362,9 +311,4 @@ Polymer({
return '';
}
},
-
- /** @private */
- onCloseDriveCacheDialog_: function() {
- cr.ui.focusWithoutInk(assert(this.$$('#deleteButton')));
- },
});
diff --git a/chromium/chrome/browser/resources/settings/device_page/storage_external.html b/chromium/chrome/browser/resources/settings/device_page/storage_external.html
index 922c2613d1f..da2d3cafc7d 100644
--- a/chromium/chrome/browser/resources/settings/device_page/storage_external.html
+++ b/chromium/chrome/browser/resources/settings/device_page/storage_external.html
@@ -15,7 +15,7 @@
</style>
<div class="settings-box first">
<span>
- $i18n{storageAndroidAppsExternalDrivesNote}
+ $i18nRaw{storageAndroidAppsExternalDrivesNote}
</span>
</div>
<h2>$i18n{storageExternalStorageListHeader}</h2>