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

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

Issue 13963004: Extract common OOBE controller code from oobe.js/login.js. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oobe_common.js -> login_common.js Created 7 years, 8 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 | « chrome/browser/resources/chromeos/login/login.js ('k') | chrome/browser/resources/chromeos/login/oobe.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/login_common.js
diff --git a/chrome/browser/resources/chromeos/login/login.js b/chrome/browser/resources/chromeos/login/login_common.js
similarity index 77%
copy from chrome/browser/resources/chromeos/login/login.js
copy to chrome/browser/resources/chromeos/login/login_common.js
index 8afdf896bcbc5fc8dc39f1ebf5fc1ca436453d11..930476a3069821ec0d853fbff974204093514fd0 100644
--- a/chrome/browser/resources/chromeos/login/login.js
+++ b/chrome/browser/resources/chromeos/login/login_common.js
@@ -1,10 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/**
- * @fileoverview Login UI based on a stripped down OOBE controller.
- * TODO(xiyuan): Refactoring this to get a better structure.
+ * @fileoverview Common OOBE controller methods.
*/
<include src="../user_images_grid.js"></include>
@@ -14,16 +13,16 @@
<include src="header_bar.js"></include>
<include src="network_dropdown.js"></include>
<include src="oobe_screen_oauth_enrollment.js"></include>
-<include src="oobe_screen_user_image.js"></include>
<include src="oobe_screen_reset.js"></include>
-<include src="screen_wrong_hwid.js"></include>
+<include src="oobe_screen_terms_of_service.js"></include>
+<include src="oobe_screen_user_image.js"></include>
<include src="screen_account_picker.js"></include>
-<include src="screen_gaia_signin.js"></include>
<include src="screen_error_message.js"></include>
-<include src="screen_tpm_error.js"></include>
-<include src="screen_password_changed.js"></include>
+<include src="screen_gaia_signin.js"></include>
<include src="screen_locally_managed_user_creation.js"></include>
-<include src="oobe_screen_terms_of_service.js"></include>
+<include src="screen_password_changed.js"></include>
+<include src="screen_tpm_error.js"></include>
+<include src="screen_wrong_hwid.js"></include>
<include src="user_pod_row.js"></include>
cr.define('cr.ui', function() {
@@ -45,30 +44,6 @@ cr.define('cr.ui', function() {
};
/**
- * Initializes the OOBE flow. This will cause all C++ handlers to
- * be invoked to do final setup.
- */
- Oobe.initialize = function() {
- DisplayManager.initialize();
- oobe.WrongHWIDScreen.register();
- login.AccountPickerScreen.register();
- login.GaiaSigninScreen.register();
- oobe.OAuthEnrollmentScreen.register();
- oobe.UserImageScreen.register(/* lazyInit= */ true);
- oobe.ResetScreen.register();
- login.ErrorMessageScreen.register();
- login.TPMErrorMessageScreen.register();
- login.PasswordChangedScreen.register();
- login.LocallyManagedUserCreationScreen.register();
- oobe.TermsOfServiceScreen.register();
-
- cr.ui.Bubble.decorate($('bubble'));
- login.HeaderBar.decorate($('login-header-bar'));
-
- chrome.send('screenStateInitialize');
- };
-
- /**
* Handle accelerators. These are passed from native code instead of a JS
* event handler in order to make sure that embedded iframes cannot swallow
* them.
@@ -94,26 +69,6 @@ cr.define('cr.ui', function() {
};
/**
- * Dummy Oobe functions not present with stripped login UI.
- */
- Oobe.initializeA11yMenu = function(e) {};
- Oobe.handleAccessbilityLinkClick = function(e) {};
- Oobe.handleSpokenFeedbackClick = function(e) {};
- Oobe.handleHighContrastClick = function(e) {};
- Oobe.handleScreenMagnifierClick = function(e) {};
- Oobe.enableContinueButton = function(enable) {};
- Oobe.setUsageStats = function(checked) {};
- Oobe.setOemEulaUrl = function(oemEulaUrl) {};
- Oobe.setUpdateProgress = function(progress) {};
- Oobe.showUpdateEstimatedTimeLeft = function(enable) {};
- Oobe.setUpdateEstimatedTimeLeft = function(seconds) {};
- Oobe.setUpdateMessage = function(message) {};
- Oobe.showUpdateCurtain = function(enable) {};
- Oobe.setTpmPassword = function(password) {};
- Oobe.refreshA11yInfo = function(data) {};
- Oobe.reloadContent = function(data) {};
-
- /**
* Updates version label visibilty.
* @param {boolean} show True if version label should be visible.
*/
@@ -194,9 +149,12 @@ cr.define('cr.ui', function() {
};
/**
- * Clears error bubble.
+ * Clears error bubble as well as optional menus that could be open.
*/
Oobe.clearErrors = function() {
+ var accessibilityMenu = $('accessibility-menu');
+ if (accessibilityMenu)
+ accessibilityMenu.hide();
DisplayManager.clearErrors();
};
@@ -205,7 +163,7 @@ cr.define('cr.ui', function() {
* before login UI is dismissed.
*/
Oobe.animateAuthenticationSuccess = function() {
- $('login-header-bar').animateOut(function() {
+ login.HeaderBar.animateOut(function() {
chrome.send('unlockOnLoginSuccess');
});
};
@@ -214,7 +172,7 @@ cr.define('cr.ui', function() {
* Displays animations that have to happen once login UI is fully displayed.
*/
Oobe.animateOnceFullyDisplayed = function() {
- $('login-header-bar').animateIn();
+ login.HeaderBar.animateIn();
};
/**
@@ -302,5 +260,3 @@ disableTextSelectAndDrag(function(e) {
src instanceof HTMLInputElement &&
/text|password|search/.test(src.type);
});
-
-document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize);
« no previous file with comments | « chrome/browser/resources/chromeos/login/login.js ('k') | chrome/browser/resources/chromeos/login/oobe.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698