summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/extensions/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/extensions/chromeos')
-rw-r--r--chromium/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js2
-rw-r--r--chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.css14
-rw-r--r--chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.js2
3 files changed, 9 insertions, 9 deletions
diff --git a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js
index 28b0b3a921f..d92784097d7 100644
--- a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js
+++ b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js
@@ -53,7 +53,7 @@ cr.define('extensions', function() {
/**
* Loads the given list of apps.
- * @param {!Array.<!Object>} apps An array of app info objects.
+ * @param {!Array<!Object>} apps An array of app info objects.
*/
setApps: function(apps) {
this.dataModel = new ArrayDataModel(apps);
diff --git a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.css b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.css
index 33c752bb100..18b0168ed94 100644
--- a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.css
+++ b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.css
@@ -26,8 +26,8 @@ list .row-delete-button {
background-color: transparent;
/* TODO(stuartmorgan): Replace with real images once they are available. */
background-image: -webkit-image-set(
- url('../../../../../ui/resources/default_100_percent/close_2.png') 1x,
- url('../../../../../ui/resources/default_200_percent/close_2.png') 2x);
+ url(../../../../../ui/resources/default_100_percent/close_2.png) 1x,
+ url(../../../../../ui/resources/default_200_percent/close_2.png) 2x);
border: none;
display: block;
height: 16px;
@@ -46,17 +46,17 @@ list .row-delete-button[disabled] {
list .row-delete-button:hover {
background-image: -webkit-image-set(
- url('../../../../../ui/resources/default_100_percent/close_2_hover.png')
+ url(../../../../../ui/resources/default_100_percent/close_2_hover.png)
1x,
- url('../../../../../ui/resources/default_200_percent/close_2_hover.png')
+ url(../../../../../ui/resources/default_200_percent/close_2_hover.png)
2x);
}
list .row-delete-button:active {
background-image: -webkit-image-set(
- url('../../../../../ui/resources/default_100_percent/close_2_pressed.png')
+ url(../../../../../ui/resources/default_100_percent/close_2_pressed.png)
1x,
- url('../../../../../ui/resources/default_200_percent/close_2_pressed.png')
+ url(../../../../../ui/resources/default_200_percent/close_2_pressed.png)
2x);
}
@@ -118,7 +118,7 @@ list .row-delete-button:active {
}
.kiosk-app-icon.spinner {
- background-image: url('chrome://resources/images/spinner.svg') !important;
+ background-image: url(chrome://resources/images/throbber.svg) !important;
}
.kiosk-app-name,
diff --git a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.js b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.js
index 30187087fff..4697bcaef6e 100644
--- a/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.js
+++ b/chromium/chrome/browser/resources/extensions/chromeos/kiosk_apps.js
@@ -100,7 +100,7 @@ cr.define('extensions', function() {
/**
* Sets apps to be displayed in kiosk-app-list.
- * @param {!Object.<{apps: !Array.<AppDict>, disableBailout: boolean,
+ * @param {!Object<{apps: !Array<AppDict>, disableBailout: boolean,
* hasAutoLaunchApp: boolean}>} settings An object containing an array of
* app info objects and disable bailout shortcut flag.
*/