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

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

Issue 10826267: [cros] OOBE transitions polishing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/oobe.css » ('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 2030598478a6e130bb45f75738f4c4406bee450b..c9c473af859184cd2f4c11fde63b864b9691a163 100644
--- a/chrome/browser/resources/chromeos/login/display_manager.js
+++ b/chrome/browser/resources/chromeos/login/display_manager.js
@@ -235,8 +235,14 @@ cr.define('cr.ui.login', function() {
}
} else {
// First screen on OOBE launch.
- $('inner-container').classList.remove('down');
- newHeader.classList.remove('right');
+ var innerContainer = $('inner-container');
+ innerContainer.classList.remove('down');
+ innerContainer.addEventListener(
+ 'webkitTransitionEnd', function f(e) {
+ innerContainer.removeEventListener('webkitTransitionEnd', f);
+ $('progress-dots').classList.remove('down');
+ });
+ newHeader.classList.remove('right'); // Old OOBE.
// Report back first OOBE screen being painted.
window.webkitRequestAnimationFrame(function() {
chrome.send('loginVisible');
@@ -320,20 +326,22 @@ cr.define('cr.ui.login', function() {
updateInnerContainerSize_: function(screen) {
var height = screen.offsetHeight;
var width = screen.offsetWidth;
- for (var i = 0, screenGroup; screenGroup = SCREEN_GROUPS[i]; i++) {
- if (screenGroup.indexOf(screen.id) != -1) {
- // Set screen dimensions to maximum dimensions within this group.
- for (var j = 0, screen2; screen2 = $(screenGroup[j]); j++) {
- height = Math.max(height, screen2.offsetHeight);
- width = Math.max(width, screen2.offsetWidth);
+ if (this.isNewOobe()) {
+ for (var i = 0, screenGroup; screenGroup = SCREEN_GROUPS[i]; i++) {
+ if (screenGroup.indexOf(screen.id) != -1) {
+ // Set screen dimensions to maximum dimensions within this group.
+ for (var j = 0, screen2; screen2 = $(screenGroup[j]); j++) {
+ height = Math.max(height, screen2.offsetHeight);
+ width = Math.max(width, screen2.offsetWidth);
+ }
+ break;
}
- break;
}
}
$('inner-container').style.height = height + 'px';
if (this.isNewOobe()) {
$('inner-container').style.width = width + 'px';
- // This requires |screen| to have |box-sizing: border-box|.
+ // This requires |screen| to have 'box-sizing: border-box'.
screen.style.width = width + 'px';
screen.style.height = height + 'px';
}
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/oobe.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698