Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2106)

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 24980006: ash: Remove old lock animation implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/chromeos/login/header_bar.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 25170665bedacee72dbf4046b13815998dd1ab9a..5410f80c0445570c9023956630c64dd941064098 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -231,19 +231,14 @@ void ScreenLocker::OnLoginSuccess(
authentication_capture_->pending_requests = pending_requests;
authentication_capture_->using_oauth = using_oauth;
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(ash::switches::kAshDisableNewLockAnimations)) {
- UnlockOnLoginSuccess();
- } else {
- // Add guard for case when something get broken in call chain to unlock
- // for sure.
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&ScreenLocker::UnlockOnLoginSuccess,
- weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kUnlockGuardTimeoutMs));
- delegate_->AnimateAuthenticationSuccess();
- }
+ // Add guard for case when something get broken in call chain to unlock
+ // for sure.
+ base::MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
+ base::Bind(&ScreenLocker::UnlockOnLoginSuccess,
+ weak_factory_.GetWeakPtr()),
+ base::TimeDelta::FromMilliseconds(kUnlockGuardTimeoutMs));
+ delegate_->AnimateAuthenticationSuccess();
}
void ScreenLocker::UnlockOnLoginSuccess() {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/chromeos/login/header_bar.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698