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

Unified Diff: ash/rotator/screen_rotation_animator.cc

Issue 1139793003: Disable Rotation Animations on Login Pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/rotator/screen_rotation_animator.cc
diff --git a/ash/rotator/screen_rotation_animator.cc b/ash/rotator/screen_rotation_animator.cc
index 9b746b6821a04ea20bab0f03aca94f018b063812..742ade963d94756d7a4eb2405df79a2c6a475c8c 100644
--- a/ash/rotator/screen_rotation_animator.cc
+++ b/ash/rotator/screen_rotation_animator.cc
@@ -12,6 +12,7 @@
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/rotator/screen_rotation_animation.h"
+#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/time/time.h"
@@ -280,10 +281,19 @@ ScreenRotationAnimator::~ScreenRotationAnimator() {
}
bool ScreenRotationAnimator::CanAnimate() const {
+ // Animations are currently broken on the login screen.
+ // (chrome-os-partners:40118). Disabling the animations on this screen for
+ // M-43
return Shell::GetInstance()
- ->display_manager()
- ->GetDisplayForId(display_id_)
- .is_valid();
+ ->display_manager()
+ ->GetDisplayForId(display_id_)
+ .is_valid() &&
+ Shell::GetInstance()
+ ->session_state_delegate()
+ ->IsActiveUserSessionStarted() &&
+ !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
+ Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ SessionStateDelegate::SESSION_STATE_ACTIVE;
}
void ScreenRotationAnimator::Rotate(gfx::Display::Rotation new_rotation,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698