From 71224377333391a17798981148cced3091beef9d Mon Sep 17 00:00:00 2001 From: "merkulova@chromium.org" Date: Thu, 6 Feb 2014 09:35:11 +0000 Subject: [PATCH] Login pods focusing animation is skipped for login screen after sign out. For login screen after boot animation kept on. BUG=280307 Review URL: https://codereview.chromium.org/132883019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249312 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/chromeos/login/login.html | 2 +- chrome/browser/resources/chromeos/login/user_pod_row.css | 7 +++++-- chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/chrome/browser/resources/chromeos/login/login.html b/chrome/browser/resources/chromeos/login/login.html index 52e2c10c4972..f60e4f8e38d4 100644 --- a/chrome/browser/resources/chromeos/login/login.html +++ b/chrome/browser/resources/chromeos/login/login.html @@ -1,5 +1,5 @@ - + diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.css b/chrome/browser/resources/chromeos/login/user_pod_row.css index d0b2c302bcf3..e436864d5304 100644 --- a/chrome/browser/resources/chromeos/login/user_pod_row.css +++ b/chrome/browser/resources/chromeos/login/user_pod_row.css @@ -22,8 +22,6 @@ podrow.images-loading { .pod { -webkit-tap-highlight-color: transparent; -webkit-transform: scale3d(0.9, 0.9, 0.9); - -webkit-transition: -webkit-transform 180ms ease, - opacity 180ms ease; background-color: white; border-radius: 2px; box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), @@ -39,6 +37,11 @@ podrow.images-loading { z-index: 0; } +html[run=firstExecAfterBoot] .pod { + -webkit-transition: -webkit-transform 180ms ease, + opacity 180ms ease; +} + .account-picker.flying-pods .pod { -webkit-transition: all 180ms ease; } diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 7589dbf4e4d8..574e14b429f9 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -388,6 +388,10 @@ void SigninScreenHandler::DeclareLocalizedValues( if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); + + builder->Add("runType", CommandLine::ForCurrentProcess()->HasSwitch( + switches::kFirstExecAfterBoot) ? "firstExecAfterBoot" : + "notFirstExecAfterBoot"); } void SigninScreenHandler::Show(const LoginScreenContext& context) { -- 2.11.4.GIT