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

Unified Diff: ui/login/screen.js

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix to Screen.initialize(). Created 6 years, 1 month 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 | « components/login/screens/screen_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/login/screen.js
diff --git a/ui/login/screen.js b/ui/login/screen.js
index 2dcaebbfcd83edb26e0234f41ae035d131e6d242..93648271d1a291a6e782f624728b703dd80f4295 100644
--- a/ui/login/screen.js
+++ b/ui/login/screen.js
@@ -43,7 +43,7 @@ cr.define('login', function() {
contextObservers_: null,
/**
- * Called during screen registration.
+ * Called during screen initialization.
*/
decorate: doNothing,
@@ -116,7 +116,11 @@ cr.define('login', function() {
* @private
*/
initializeImpl_: function() {
- this.screenContext_ = new login.ScreenContext();
+ if (cr.isChromeOS)
+ this.screenContext_ = new login.ScreenContext();
+
+ this.decorate();
+
this.querySelectorAllImpl_('[alias]').forEach(function(element) {
var alias = element.getAttribute('alias');
if (alias in this)
@@ -320,7 +324,7 @@ cr.define('login', function() {
api.register = function() {
var screen = $(id);
screen.__proto__ = new Constructor();
- screen.decorate();
+ screen.initialize();
Oobe.getInstance().registerScreen(screen);
};
« no previous file with comments | « components/login/screens/screen_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698