From 78f64bb730284ea195de88aec389453e792b9fb7 Mon Sep 17 00:00:00 2001
From: dbeam <dbeam@chromium.org>
Date: Wed, 4 Feb 2015 13:43:21 -0800
Subject: [PATCH] webui: make 0 into 0ms when it's a <time>.

R=arv@chromium.org
TBR=sky@chromium.org
BUG=454776

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

Cr-Commit-Position: refs/heads/master@{#314643}
---
 chrome/browser/devtools/frontend/devtools_discovery_page.html  |  2 +-
 chrome/browser/resources/extensions/extensions.css             |  2 +-
 chrome/browser/resources/gaia_auth/offline.css                 |  4 ++--
 chrome/browser/resources/ntp4/apps_page.css                    |  2 +-
 chrome/browser/resources/ntp4/new_tab.css                      | 10 +++++-----
 chrome/browser/resources/set_as_default_browser.css            |  2 +-
 .../docs/examples/api/fontSettings/css/chrome_shared.css       |  4 ++--
 .../extensions/docs/examples/api/fontSettings/css/overlay.css  |  2 +-
 chrome/test/data/webui/print_preview.js                        |  8 ++++----
 .../chromevox/chromevox/background/chrome_shared2.css          |  4 ++--
 ui/file_manager/file_manager/foreground/css/drive_welcome.css  |  4 ++--
 ui/file_manager/gallery/css/gallery.css                        | 10 +++++-----
 ui/webui/resources/css/chrome_shared.css                       |  4 ++--
 ui/webui/resources/css/overlay.css                             |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/chrome/browser/devtools/frontend/devtools_discovery_page.html b/chrome/browser/devtools/frontend/devtools_discovery_page.html
index 9d9fc5764e9c..cf93966c72ee 100644
--- a/chrome/browser/devtools/frontend/devtools_discovery_page.html
+++ b/chrome/browser/devtools/frontend/devtools_discovery_page.html
@@ -32,7 +32,7 @@ body {
   padding: 10px;
   -webkit-transition-property: background-color, border-color;
   -webkit-transition: background-color 0.15s, 0.15s;
-  -webkit-transition-delay: 0, 0;
+  -webkit-transition-delay: 0ms, 0ms;
 }
 
 .thumbnail {
diff --git a/chrome/browser/resources/extensions/extensions.css b/chrome/browser/resources/extensions/extensions.css
index 02241100aedd..3211c358233b 100644
--- a/chrome/browser/resources/extensions/extensions.css
+++ b/chrome/browser/resources/extensions/extensions.css
@@ -3,7 +3,7 @@
  * found in the LICENSE file. */
 
 html.loading * {
-  transition-duration: 0 !important;
+  transition-duration: 0ms !important;
 }
 
 html:not(.focus-outline-visible)
diff --git a/chrome/browser/resources/gaia_auth/offline.css b/chrome/browser/resources/gaia_auth/offline.css
index 92b5b038440a..5bf69db67d03 100644
--- a/chrome/browser/resources/gaia_auth/offline.css
+++ b/chrome/browser/resources/gaia_auth/offline.css
@@ -167,14 +167,14 @@ input[type=submit].g-button {
   overflow: visible;
 }
 .g-button:hover {
-  -webkit-transition: all 0;
+  -webkit-transition: all 0ms;
   background-color: #f8f8f8;
   background-image: linear-gradient(to bottom, #f8f8f8, #f1f1f1);
   border: 1px solid #c6c6c6;
   box-shadow: 0 1px 1px rgba(0,0,0,0.1);
   color: #333;
   text-decoration: none;
-  transition: all 0;
+  transition: all 0ms;
 }
 .g-button:active {
   background-color: #f6f6f6;
diff --git a/chrome/browser/resources/ntp4/apps_page.css b/chrome/browser/resources/ntp4/apps_page.css
index fc9c61b153f6..de0f83a4681d 100644
--- a/chrome/browser/resources/ntp4/apps_page.css
+++ b/chrome/browser/resources/ntp4/apps_page.css
@@ -23,7 +23,7 @@
 /* Active gets applied right before .suppress-active, so to avoid flicker
  * we need to make the scale go back to normal without an animation. */
 .app-contents.suppress-active {
-  -webkit-transition-duration: 0;
+  -webkit-transition-duration: 0ms;
 }
 
 .app-contents > span {
diff --git a/chrome/browser/resources/ntp4/new_tab.css b/chrome/browser/resources/ntp4/new_tab.css
index 187059f82587..de911ba96a62 100644
--- a/chrome/browser/resources/ntp4/new_tab.css
+++ b/chrome/browser/resources/ntp4/new_tab.css
@@ -299,8 +299,8 @@ html[dir='rtl'] .login-status-icon {
 
 #trash {
   -webkit-padding-start: 10px;
-  -webkit-transition: top 200ms, opacity 0;
-  -webkit-transition-delay: 0, 200ms;
+  -webkit-transition: top 200ms, opacity 0ms;
+  -webkit-transition-delay: 0ms, 200ms;
   color: #222;
   height: 100%;
   opacity: 0;
@@ -316,8 +316,8 @@ html[dir='rtl'] #trash {
 }
 
 #footer.showing-trash-mode #trash {
-  -webkit-transition-delay: 0, 0;
-  -webkit-transition-duration: 0, 200ms;
+  -webkit-transition-delay: 0ms, 0ms;
+  -webkit-transition-duration: 0ms, 200ms;
   opacity: 0.75;
   top: 0;
 }
@@ -433,7 +433,7 @@ html[dir='rtl'] #chrome-web-store-title {
 
 /* In trash mode, hide the menus and web store link. */
 #footer.showing-trash-mode .menu-container {
-  -webkit-transition-delay: 0;
+  -webkit-transition-delay: 0ms;
   opacity: 0;
   visibility: hidden;
 }
diff --git a/chrome/browser/resources/set_as_default_browser.css b/chrome/browser/resources/set_as_default_browser.css
index 835590fc76b5..21d7a9ded063 100644
--- a/chrome/browser/resources/set_as_default_browser.css
+++ b/chrome/browser/resources/set_as_default_browser.css
@@ -95,7 +95,7 @@
 }
 
 #metro-action-box button:hover {
-  -webkit-transition: all 0;
+  -webkit-transition: all 0ms;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
 }
 
diff --git a/chrome/common/extensions/docs/examples/api/fontSettings/css/chrome_shared.css b/chrome/common/extensions/docs/examples/api/fontSettings/css/chrome_shared.css
index 48a6c26e671b..09da2ad96f05 100644
--- a/chrome/common/extensions/docs/examples/api/fontSettings/css/chrome_shared.css
+++ b/chrome/common/extensions/docs/examples/api/fontSettings/css/chrome_shared.css
@@ -10,8 +10,8 @@
 }
 
 html.loading * {
-  -webkit-transition-delay: 0 !important;
-  -webkit-transition-duration: 0 !important;
+  -webkit-transition-delay: 0ms !important;
+  -webkit-transition-duration: 0ms !important;
 }
 
 body {
diff --git a/chrome/common/extensions/docs/examples/api/fontSettings/css/overlay.css b/chrome/common/extensions/docs/examples/api/fontSettings/css/overlay.css
index f70d6dc3aefa..0549332b5b99 100644
--- a/chrome/common/extensions/docs/examples/api/fontSettings/css/overlay.css
+++ b/chrome/common/extensions/docs/examples/api/fontSettings/css/overlay.css
@@ -43,7 +43,7 @@
 /* If the options page is loading don't do the transition. */
 .loading .overlay,
 .loading .overlay .page {
-  -webkit-transition-duration: 0 !important;
+  -webkit-transition-duration: 0ms !important;
 }
 
 /* keyframes used to pulse the overlay */
diff --git a/chrome/test/data/webui/print_preview.js b/chrome/test/data/webui/print_preview.js
index 3a5037ee78c0..55425bb0a690 100644
--- a/chrome/test/data/webui/print_preview.js
+++ b/chrome/test/data/webui/print_preview.js
@@ -192,10 +192,10 @@ PrintPreviewWebUITest.prototype = {
     var noAnimationStyle = document.createElement('style');
     noAnimationStyle.textContent =
       '* {' +
-      '  -webkit-transition-duration: 0s !important;' +
-      '  -webkit-transition-delay: 0s !important;' +
-      '  -webkit-animation-duration: 0s !important;' +
-      '  -webkit-animation-delay: 0s !important;' +
+      '  -webkit-transition-duration: 0ms !important;' +
+      '  -webkit-transition-delay: 0ms !important;' +
+      '  -webkit-animation-duration: 0ms !important;' +
+      '  -webkit-animation-delay: 0ms !important;' +
       '}';
     document.querySelector('head').appendChild(noAnimationStyle);
   }
diff --git a/chrome/third_party/chromevox/chromevox/background/chrome_shared2.css b/chrome/third_party/chromevox/chromevox/background/chrome_shared2.css
index 60c7d5a2d72d..701921a2a3cb 100644
--- a/chrome/third_party/chromevox/chromevox/background/chrome_shared2.css
+++ b/chrome/third_party/chromevox/chromevox/background/chrome_shared2.css
@@ -12,8 +12,8 @@
 }
 
 html.loading * {
-  -webkit-transition-delay: 0 !important;
-  -webkit-transition-duration: 0 !important;
+  -webkit-transition-delay: 0ms !important;
+  -webkit-transition-duration: 0ms !important;
 }
 
 body {
diff --git a/ui/file_manager/file_manager/foreground/css/drive_welcome.css b/ui/file_manager/file_manager/foreground/css/drive_welcome.css
index 900185b10ba7..22a49d0947da 100644
--- a/ui/file_manager/file_manager/foreground/css/drive_welcome.css
+++ b/ui/file_manager/file_manager/foreground/css/drive_welcome.css
@@ -44,7 +44,7 @@
   border-color: #C6C6C6;
   box-shadow: 0 1px 1px rgba(0,0,0,0.1);
   color: #222;
-  transition: all 0;
+  transition: all 0ms;
 }
 
 .drive-welcome-button:active {
@@ -74,7 +74,7 @@
   height: 100px;
   overflow: hidden;
   position: relative;
-  transition: height 180ms ease, visibility 0 linear 180ms;
+  transition: height 180ms ease, visibility 0ms linear 180ms;
 }
 
 .dialog-container:not([drive-welcome='header']) .drive-welcome.header {
diff --git a/ui/file_manager/gallery/css/gallery.css b/ui/file_manager/gallery/css/gallery.css
index 02507a37f511..993dbeb63aae 100644
--- a/ui/file_manager/gallery/css/gallery.css
+++ b/ui/file_manager/gallery/css/gallery.css
@@ -190,7 +190,7 @@ input[type='checkbox']:checked {
 
 /* Hide immediately when entering the slideshow. */
 .gallery[tools][slideshow] > .toolbar {
-  transition-duration: 0;
+  transition-duration: 0ms;
 }
 
 .gallery[tools][locked] > .toolbar {
@@ -294,7 +294,7 @@ input[type='checkbox']:checked {
   background-color: transparent;
   overflow: hidden;
   position: absolute;
-  transition: visibility 0 linear 180ms, all 180ms linear;
+  transition: visibility 0ms linear 180ms, all 180ms linear;
   width: 260px;
 }
 
@@ -440,13 +440,13 @@ input[type='checkbox']:checked {
 .gallery .toolbar .ribbon {
   height: 100%;
   overflow: hidden;
-  transition: opacity 180ms linear, visibility 0 linear;
+  transition: opacity 180ms linear, visibility 0ms linear;
   z-index: 0;
 }
 
 .gallery[editing] .toolbar .ribbon {
   opacity: 0;
-  transition-delay: 0, 180ms;
+  transition-delay: 0ms, 180ms;
   visibility: hidden;
 }
 
@@ -518,7 +518,7 @@ input[type='checkbox']:checked {
   left: 280px;
   opacity: 0;
   right: 280px;
-  transition: opacity 180ms linear, visibility 0 linear 180ms;
+  transition: opacity 180ms linear, visibility 0ms linear 180ms;
   visibility: hidden;
   margin-bottom: -55px;
 }
diff --git a/ui/webui/resources/css/chrome_shared.css b/ui/webui/resources/css/chrome_shared.css
index 6ad44bb4ea41..785e9d519a95 100644
--- a/ui/webui/resources/css/chrome_shared.css
+++ b/ui/webui/resources/css/chrome_shared.css
@@ -21,8 +21,8 @@ html {
 }
 
 html.loading * {
-  -webkit-transition-delay: 0 !important;
-  -webkit-transition-duration: 0 !important;
+  -webkit-transition-delay: 0ms !important;
+  -webkit-transition-duration: 0ms !important;
 }
 
 body {
diff --git a/ui/webui/resources/css/overlay.css b/ui/webui/resources/css/overlay.css
index 29fc4b6931f5..c755c15828d1 100644
--- a/ui/webui/resources/css/overlay.css
+++ b/ui/webui/resources/css/overlay.css
@@ -46,7 +46,7 @@
 /* If the options page is loading don't do the transition. */
 .loading .overlay,
 .loading .overlay .page {
-  -webkit-transition-duration: 0 !important;
+  -webkit-transition-duration: 0ms !important;
 }
 
 /* keyframes used to pulse the overlay */
-- 
2.11.4.GIT