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

Unified Diff: chrome/browser/resources/chromeos/login/display_manager.js

Issue 10830332: [cros] Remove vertical clipping in OOBE step container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert #2 Created 8 years, 4 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 | chrome/browser/resources/chromeos/login/login.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/display_manager.js
diff --git a/chrome/browser/resources/chromeos/login/display_manager.js b/chrome/browser/resources/chromeos/login/display_manager.js
index c9c473af859184cd2f4c11fde63b864b9691a163..a930d7e369b248d4aa97fee77e8198aeb668b5ef 100644
--- a/chrome/browser/resources/chromeos/login/display_manager.js
+++ b/chrome/browser/resources/chromeos/login/display_manager.js
@@ -217,16 +217,17 @@ cr.define('cr.ui.login', function() {
// Adjust inner container height based on new step's height.
this.updateInnerContainerSize_(newStep);
+ var innerContainer = $('inner-container');
if (this.currentStep_ != nextStepIndex &&
!oldStep.classList.contains('hidden')) {
if (oldStep.classList.contains('animated') || !this.isNewOobe()) {
- oldStep.classList.add('animation');
+ innerContainer.classList.add('animation');
oldStep.addEventListener('webkitTransitionEnd', function f(e) {
oldStep.removeEventListener('webkitTransitionEnd', f);
if (oldStep.classList.contains('faded') ||
oldStep.classList.contains('left') ||
oldStep.classList.contains('right')) {
- oldStep.classList.remove('animation');
+ innerContainer.classList.remove('animation');
oldStep.classList.add('hidden');
}
});
@@ -235,7 +236,6 @@ cr.define('cr.ui.login', function() {
}
} else {
// First screen on OOBE launch.
- var innerContainer = $('inner-container');
innerContainer.classList.remove('down');
innerContainer.addEventListener(
'webkitTransitionEnd', function f(e) {
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/login.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698