Fix Chrome logo to transition smoothly between the demo login screen and login spinner.

R=dpolukhin@chromium.org
BUG=160433


Review URL: https://chromiumcodereview.appspot.com/11312225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167599 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/resources/chromeos/login/demo_user_login.css b/chrome/browser/resources/chromeos/login/demo_user_login.css
index b2c1358..dae85d08 100644
--- a/chrome/browser/resources/chromeos/login/demo_user_login.css
+++ b/chrome/browser/resources/chromeos/login/demo_user_login.css
@@ -38,6 +38,11 @@ body {
 }
 
 #demo-login-text {
-  font-size: 24px;
-  padding-top: 80px;
+  font-size: 14px;
+  padding-left: 30px;
+  padding-top: 10px;
+}
+
+#lower-container {
+  height: 40px;
 }
diff --git a/chrome/browser/resources/chromeos/login/demo_user_login.html b/chrome/browser/resources/chromeos/login/demo_user_login.html
index 19747e9..ed3dc5d 100644
--- a/chrome/browser/resources/chromeos/login/demo_user_login.html
+++ b/chrome/browser/resources/chromeos/login/demo_user_login.html
@@ -11,11 +11,12 @@
   <div id="page">
     <div id="logo-container">
       <div>
-        <img id="logo" src="images/chrome_center_logo.jpg">
-        <img id="logo-login" src="images/chrome_retail_login.png" hidden>
+        <img id="logo" src="images/chrome_retail_login.png">
       </div>
-      <div id="demo-login-text" i18n-content="demoLoginMessage"></div>
-      <div id="login-spinner" class="inline-spinner" hidden></div>
+      <div id="lower-container">
+        <div id="demo-login-text" i18n-content="demoLoginMessage"></div>
+        <div id="login-spinner" class="inline-spinner" hidden></div>
+    </div>
     </div>
   </div>
 </body>
diff --git a/chrome/browser/resources/chromeos/login/demo_user_login.js b/chrome/browser/resources/chromeos/login/demo_user_login.js
index 269bd7e..22ce544 100644
--- a/chrome/browser/resources/chromeos/login/demo_user_login.js
+++ b/chrome/browser/resources/chromeos/login/demo_user_login.js
@@ -38,12 +38,8 @@ showLoginSpinner = function() {
   // We're already logging in - don't login on click.
   document.removeEventListener('click', onClick);
 
-  // Hide the "Click to start" assets.
-  $('logo').hidden = true;
+  // Hide the "Click to start" and show the spinner.
   $('demo-login-text').hidden = true;
-
-  // Show the "Logging in" assets.
-  $('logo-login').hidden = false;
   $('login-spinner').hidden = false;
 };
 
diff --git a/chrome/browser/resources/chromeos/login/images/chrome_center_logo.jpg b/chrome/browser/resources/chromeos/login/images/chrome_center_logo.jpg
deleted file mode 100644
index 6042283..0000000
--- a/chrome/browser/resources/chromeos/login/images/chrome_center_logo.jpg
+++ /dev/null