Commit 418d1532 authored by estade's avatar estade Committed by Commit bot

Update some spinners on ChromeOS

1) file manager's chrome web store widget
2) wallpaper gallery spinner

BUG=485779

Review URL: https://codereview.chromium.org/1140403002

Cr-Commit-Position: refs/heads/master@{#330559}
parent cf06ae59
...@@ -129,6 +129,7 @@ body { ...@@ -129,6 +129,7 @@ body {
#spinner-container { #spinner-container {
-webkit-box-align: center; -webkit-box-align: center;
-webkit-box-pack: center; -webkit-box-pack: center;
background: url(chrome://resources/images/throbber.svg) center/32px no-repeat;
display: -webkit-box; display: -webkit-box;
height: 287px; height: 287px;
padding-bottom: 15px; padding-bottom: 15px;
...@@ -138,27 +139,6 @@ body { ...@@ -138,27 +139,6 @@ body {
width: 100%; width: 100%;
} }
@-webkit-keyframes spin {
from {
-webkit-transform: rotate(0);
}
to {
-webkit-transform: rotate(360deg);
}
}
#spinner-container #spinner {
-webkit-animation-duration: 1s;
-webkit-animation-iteration-count: infinite;
-webkit-animation-name: spin;
-webkit-animation-timing-function: linear;
background-image: url(../images/ui/spinner.png);
background-position: center;
background-repeat: no-repeat;
height: 16px;
width: 16px;
}
#wallpaper-set-by-message { #wallpaper-set-by-message {
-webkit-padding-end: 5px; -webkit-padding-end: 5px;
-webkit-padding-start: 15px; -webkit-padding-start: 15px;
......
...@@ -290,7 +290,7 @@ cr.define('wallpapers', function() { ...@@ -290,7 +290,7 @@ cr.define('wallpapers', function() {
}, ShowSpinnerDelayMs); }, ShowSpinnerDelayMs);
} }
} else { } else {
// Sets dataModel to null should hide spinner immedidately. // Sets dataModel to null should hide spinner immediately.
$('spinner-container').hidden = true; $('spinner-container').hidden = true;
} }
......
...@@ -100,9 +100,7 @@ found in the LICENSE file. ...@@ -100,9 +100,7 @@ found in the LICENSE file.
<div id="category-container"> <div id="category-container">
<div id="wallpaper-set-by-message"></div> <div id="wallpaper-set-by-message"></div>
<grid id="wallpaper-grid" class="image-picker"></grid> <grid id="wallpaper-grid" class="image-picker"></grid>
<div id="spinner-container" hidden> <div id="spinner-container" hidden></div>
<div id="spinner"></div>
</div>
<div class="progress-bar" hidden> <div class="progress-bar" hidden>
<div class="progress-track"></div> <div class="progress-track"></div>
</div> </div>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"permissions": [ "permissions": [
"alarms", "alarms",
"app.window.alpha", "app.window.alpha",
"chrome://resources/",
"experimental", "experimental",
"storage", "storage",
"unlimitedStorage", "unlimitedStorage",
...@@ -34,7 +35,8 @@ ...@@ -34,7 +35,8 @@
"js/util.js", "js/util.js",
"js/event_page.js" "js/event_page.js"
] ]
} },
"content_security_policy": "img-src 'self' data: chrome://resources;"
}, },
"display_in_launcher": false "display_in_launcher": false
} }
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
.cws-widget-spinner-layer { .cws-widget-spinner-layer {
background: url(spinner.svg) center / 16px no-repeat; background: url(chrome://resources/images/throbber.svg) center/32px no-repeat;
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.7);
bottom: 0; bottom: 0;
left: 0; left: 0;
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
"cws_widget/cws_webview_client.js", "cws_widget/cws_webview_client.js",
"cws_widget/cws_widget_container.css", "cws_widget/cws_widget_container.css",
"cws_widget/cws_widget_container.js", "cws_widget/cws_widget_container.js",
"cws_widget/cws_widget_container_error_dialog.js", "cws_widget/cws_widget_container_error_dialog.js"
"cws_widget/spinner.svg"
], ],
"app": { "app": {
......
...@@ -17,5 +17,4 @@ ...@@ -17,5 +17,4 @@
<include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_JS" file="webstore_widget/cws_widget/cws_widget_container.js" type="BINDATA" /> <include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_JS" file="webstore_widget/cws_widget/cws_widget_container.js" type="BINDATA" />
<include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_ERROR_DIALOG_JS" file="webstore_widget/cws_widget/cws_widget_container_error_dialog.js" type="BINDATA" /> <include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_ERROR_DIALOG_JS" file="webstore_widget/cws_widget/cws_widget_container_error_dialog.js" type="BINDATA" />
<include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_CSS" file="webstore_widget/cws_widget/cws_widget_container.css" type="BINDATA" /> <include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_CSS" file="webstore_widget/cws_widget/cws_widget_container.css" type="BINDATA" />
<include name="IDR_CHROME_APPS_WEBSTORE_WIDGET_SPINNER" file="webstore_widget/cws_widget/spinner.svg" type="BINDATA" />
</grit-part> </grit-part>
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