Commit 04eec2db authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Remove code that has no actual effect

* "down" property does not have any effect on outer container
* with new material design, all dialogs have same size, no
  need for special handling

Bug: 999058
Change-Id: I670a4e885691deca606afa395bd8f5b961303aab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792862
Commit-Queue: Denis Kuznetsov <antrim@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699393}
parent 5e19d995
<div id="background" class="background-initial"></div> <div id="background" class="background-initial"></div>
<include src="api_keys_notice.html"> <include src="api_keys_notice.html">
<div id="scroll-container"> <div id="scroll-container">
<div id="outer-container" class="down"> <div id="outer-container">
<div id="oobe" class="faded"> <div id="oobe" class="faded">
<div id="inner-container" class="down"> <div id="inner-container" class="down">
<include src="[OOBE]_screens.html"> <include src="[OOBE]_screens.html">
......
...@@ -92,7 +92,6 @@ Polymer({ ...@@ -92,7 +92,6 @@ Polymer({
ready: function() { ready: function() {
this.initializeLoginScreen('WelcomeScreen', { this.initializeLoginScreen('WelcomeScreen', {
resetAllowed: true, resetAllowed: true,
commonScreenSize: true,
enableDebuggingAllowed: true, enableDebuggingAllowed: true,
enterDemoModeAllowed: true, enterDemoModeAllowed: true,
noAnimatedTransition: true, noAnimatedTransition: true,
......
...@@ -101,15 +101,6 @@ cr.define('cr.ui.login', function() { ...@@ -101,15 +101,6 @@ cr.define('cr.ui.login', function() {
*/ */
var MAX_SCREEN_TRANSITION_DURATION = 250; var MAX_SCREEN_TRANSITION_DURATION = 250;
/**
* Groups of screens (screen IDs) that should have the same dimensions.
* @type Array<Array<string>>
* @const
*/
var SCREEN_GROUPS = [[
SCREEN_OOBE_NETWORK, SCREEN_OOBE_EULA, SCREEN_OOBE_UPDATE,
SCREEN_OOBE_AUTO_ENROLLMENT_CHECK
]];
/** /**
* Group of screens (screen IDs) where factory-reset screen invocation is * Group of screens (screen IDs) where factory-reset screen invocation is
* available. * available.
...@@ -166,11 +157,6 @@ cr.define('cr.ui.login', function() { ...@@ -166,11 +157,6 @@ cr.define('cr.ui.login', function() {
SCREEN_OOBE_RESET, SCREEN_OOBE_RESET,
]; ];
/**
* OOBE screens group index.
*/
var SCREEN_GROUP_OOBE = 0;
/** /**
* Constructor a display manager that manages initialization of screens, * Constructor a display manager that manages initialization of screens,
* transitions, error messages display. * transitions, error messages display.
...@@ -265,7 +251,7 @@ cr.define('cr.ui.login', function() { ...@@ -265,7 +251,7 @@ cr.define('cr.ui.login', function() {
}, },
/** /**
* Returns dimensions of screen exluding header bar. * Returns dimensions of screen excluding header bar.
* @type {Object} * @type {Object}
*/ */
get clientAreaSize() { get clientAreaSize() {
...@@ -631,7 +617,6 @@ cr.define('cr.ui.login', function() { ...@@ -631,7 +617,6 @@ cr.define('cr.ui.login', function() {
innerContainer.classList.remove('down'); innerContainer.classList.remove('down');
innerContainer.addEventListener('transitionend', function f(e) { innerContainer.addEventListener('transitionend', function f(e) {
innerContainer.removeEventListener('transitionend', f); innerContainer.removeEventListener('transitionend', f);
outerContainer.classList.remove('down');
chrome.send('loginVisible', ['oobe']); chrome.send('loginVisible', ['oobe']);
// Refresh defaultControl. It could have changed. // Refresh defaultControl. It could have changed.
var defaultControl = newStep.defaultControl; var defaultControl = newStep.defaultControl;
...@@ -756,10 +741,6 @@ cr.define('cr.ui.login', function() { ...@@ -756,10 +741,6 @@ cr.define('cr.ui.login', function() {
} }
this.appendButtons_(el.buttons, screenId); this.appendButtons_(el.buttons, screenId);
if (attributes && attributes.commonScreenSize) {
SCREEN_GROUPS[0].push(screenId);
}
if (el.updateOobeConfiguration && this.oobe_configuration_) if (el.updateOobeConfiguration && this.oobe_configuration_)
el.updateOobeConfiguration(this.oobe_configuration_); el.updateOobeConfiguration(this.oobe_configuration_);
}, },
...@@ -785,22 +766,7 @@ cr.define('cr.ui.login', function() { ...@@ -785,22 +766,7 @@ cr.define('cr.ui.login', function() {
var width = screen.getPreferredSize().width; var width = screen.getPreferredSize().width;
var height = screen.getPreferredSize().height; var height = screen.getPreferredSize().height;
for (let i = 0; i < SCREEN_GROUPS.length; ++i) {
let screenGroup = SCREEN_GROUPS[i];
if (screenGroup.indexOf(screen.id) != -1) {
// Set screen dimensions to maximum dimensions within this group.
for (let j = 0; j < screenGroup.length; ++j) {
let screen2 = $(screenGroup[j]);
// Other screens in this screen group might be missing if we're not
// in OOBE.
if (!screen2)
continue;
width = Math.max(width, screen2.getPreferredSize().width);
height = Math.max(height, screen2.getPreferredSize().height);
}
break;
}
}
if (!this.isAdaptiveOobe) { if (!this.isAdaptiveOobe) {
if (screen.classList.contains('fullscreen')) { if (screen.classList.contains('fullscreen')) {
$('inner-container').style.height = '100%'; $('inner-container').style.height = '100%';
...@@ -876,18 +842,6 @@ cr.define('cr.ui.login', function() { ...@@ -876,18 +842,6 @@ cr.define('cr.ui.login', function() {
} }
}, },
/**
* Initialized first group of OOBE screens.
*/
initializeOOBEScreens: function() {
if (this.isOobeUI() && $('inner-container').classList.contains('down')) {
for (let i = 0; i < SCREEN_GROUPS[SCREEN_GROUP_OOBE].length; ++i) {
let screen = $(SCREEN_GROUPS[SCREEN_GROUP_OOBE][i]);
screen.hidden = false;
}
}
},
/** Initializes demo mode start listener. */ /** Initializes demo mode start listener. */
initializeDemoModeMultiTapListener: function() { initializeDemoModeMultiTapListener: function() {
if (this.displayType_ == DISPLAY_TYPE.OOBE) { if (this.displayType_ == DISPLAY_TYPE.OOBE) {
...@@ -1077,7 +1031,6 @@ cr.define('cr.ui.login', function() { ...@@ -1077,7 +1031,6 @@ cr.define('cr.ui.login', function() {
instance.displayType = DISPLAY_TYPE.LOGIN; instance.displayType = DISPLAY_TYPE.LOGIN;
} }
instance.initializeOOBEScreens();
instance.initializeDemoModeMultiTapListener(); instance.initializeDemoModeMultiTapListener();
window.addEventListener('resize', instance.onWindowResize_.bind(instance)); window.addEventListener('resize', instance.onWindowResize_.bind(instance));
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
/** /**
* @typedef {{ * @typedef {{
* commonScreenSize: (boolean|undefined),
* enableDebuggingAllowed: (boolean|undefined), * enableDebuggingAllowed: (boolean|undefined),
* enterDemoModeAllowed: (boolean|undefined), * enterDemoModeAllowed: (boolean|undefined),
* noAnimatedTransition: (boolean|undefined), * noAnimatedTransition: (boolean|undefined),
...@@ -21,13 +20,6 @@ ...@@ -21,13 +20,6 @@
*/ */
var DisplayManagerScreenAttributes = {}; var DisplayManagerScreenAttributes = {};
/**
* True when screen should have size matched with others.
* (i.e. it's a part of main flow)
* @type {boolean|undefined}
*/
DisplayManagerScreenAttributes.commonScreenSize;
/** /**
* True if showing "enable debugging" is allowed for the screen. * True if showing "enable debugging" is allowed for the screen.
* @type {boolean|undefined} * @type {boolean|undefined}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment