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

Unified Diff: chrome/browser/resources/chromeos/login/login.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 | « no previous file | chrome/browser/resources/chromeos/login/login_common.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.js
diff --git a/chrome/browser/resources/chromeos/login/login.js b/chrome/browser/resources/chromeos/login/login.js
index 8afdf896bcbc5fc8dc39f1ebf5fc1ca436453d11..2b7e4b8b7af7f95892b23027838d7a030d1f311b 100644
--- a/chrome/browser/resources/chromeos/login/login.js
+++ b/chrome/browser/resources/chromeos/login/login.js
@@ -4,303 +4,54 @@
/**
* @fileoverview Login UI based on a stripped down OOBE controller.
- * TODO(xiyuan): Refactoring this to get a better structure.
*/
-<include src="../user_images_grid.js"></include>
-<include src="apps_menu.js"></include>
-<include src="bubble.js"></include>
-<include src="display_manager.js"></include>
-<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="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_locally_managed_user_creation.js"></include>
-<include src="oobe_screen_terms_of_service.js"></include>
-<include src="user_pod_row.js"></include>
+<include src="login_common.js"></include>
-cr.define('cr.ui', function() {
- var DisplayManager = cr.ui.login.DisplayManager;
-
- /**
- * Constructs an Out of box controller. It manages initialization of screens,
- * transitions, error messages display.
- * @extends {DisplayManager}
- * @constructor
- */
- function Oobe() {
- }
-
- cr.addSingletonGetter(Oobe);
-
- Oobe.prototype = {
- __proto__: DisplayManager.prototype,
- };
-
- /**
- * 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.
- * @param {string} name Accelerator name.
- */
- Oobe.handleAccelerator = function(name) {
- Oobe.getInstance().handleAccelerator(name);
- };
-
- /**
- * Shows the given screen.
- * @param {Object} screen Screen params dict, e.g. {id: screenId, data: data}
- */
- Oobe.showScreen = function(screen) {
- Oobe.getInstance().showScreen(screen);
- };
-
- /**
- * Shows the previous screen of workflow.
- */
- Oobe.goBack = function() {
- Oobe.getInstance().goBack();
- };
-
- /**
- * 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.
- */
- Oobe.showVersion = function(show) {
- Oobe.getInstance().showVersion(show);
- };
-
- /**
- * Update body class to switch between OOBE UI and Login UI.
- */
- Oobe.showOobeUI = function(showOobe) {
- if (showOobe) {
- document.body.classList.remove('login-display');
- } else {
- document.body.classList.add('login-display');
- Oobe.getInstance().prepareForLoginDisplay_();
- }
-
- // Don't show header bar for OOBE.
- Oobe.getInstance().headerHidden = showOobe;
- };
-
- /**
- * Disables signin UI.
- */
- Oobe.disableSigninUI = function() {
- DisplayManager.disableSigninUI();
- };
-
- /**
- * Shows signin UI.
- * @param {string} opt_email An optional email for signin UI.
- */
- Oobe.showSigninUI = function(opt_email) {
- DisplayManager.showSigninUI(opt_email);
- };
-
- /**
- * Resets sign-in input fields.
- * @param {boolean} forceOnline Whether online sign-in should be forced.
- * If |forceOnline| is false previously used sign-in type will be used.
- */
- Oobe.resetSigninUI = function(forceOnline) {
- DisplayManager.resetSigninUI(forceOnline);
- };
-
- /**
- * Shows sign-in error bubble.
- * @param {number} loginAttempts Number of login attemps tried.
- * @param {string} message Error message to show.
- * @param {string} link Text to use for help link.
- * @param {number} helpId Help topic Id associated with help link.
- */
- Oobe.showSignInError = function(loginAttempts, message, link, helpId) {
- DisplayManager.showSignInError(loginAttempts, message, link, helpId);
- };
-
- /**
- * Shows password changed screen that offers migration.
- * @param {boolean} showError Whether to show the incorrect password error.
- */
- Oobe.showPasswordChangedScreen = function(showError) {
- DisplayManager.showPasswordChangedScreen(showError);
- };
-
- /**
- * Shows dialog to create managed user.
- */
- Oobe.showManagedUserCreationScreen = function() {
- DisplayManager.showManagedUserCreationScreen();
- };
-
- /**
- * Shows TPM error screen.
- */
- Oobe.showTpmError = function() {
- DisplayManager.showTpmError();
- };
-
- /**
- * Clears error bubble.
- */
- Oobe.clearErrors = function() {
- DisplayManager.clearErrors();
- };
-
- /**
- * Displays animations on successful authentication, that have to happen
- * before login UI is dismissed.
- */
- Oobe.animateAuthenticationSuccess = function() {
- $('login-header-bar').animateOut(function() {
- chrome.send('unlockOnLoginSuccess');
- });
- };
-
- /**
- * Displays animations that have to happen once login UI is fully displayed.
- */
- Oobe.animateOnceFullyDisplayed = function() {
- $('login-header-bar').animateIn();
- };
-
- /**
- * Handles login success notification.
- */
- Oobe.onLoginSuccess = function(username) {
- if (Oobe.getInstance().currentScreen.id == SCREEN_ACCOUNT_PICKER) {
- // TODO(nkostylev): Enable animation back when session start jank
- // is reduced. See http://crosbug.com/11116 http://crosbug.com/18307
- // $('pod-row').startAuthenticatedAnimation();
- }
- };
-
- /**
- * Sets text content for a div with |labelId|.
- * @param {string} labelId Id of the label div.
- * @param {string} labelText Text for the label.
- */
- Oobe.setLabelText = function(labelId, labelText) {
- DisplayManager.setLabelText(labelId, labelText);
- };
-
- /**
- * Sets the text content of the enterprise info message.
- * If the text is empty, the entire notification will be hidden.
- * @param {string} messageText The message text.
- */
- Oobe.setEnterpriseInfo = function(messageText) {
- DisplayManager.setEnterpriseInfo(messageText);
- };
-
- /**
- * Enforces focus on user pod of locked user.
- */
- Oobe.forceLockedUserPodFocus = function() {
- login.AccountPickerScreen.forceLockedUserPodFocus();
- };
-
- /**
- * Sets the domain name whose Terms of Service are being shown on the Terms of
- * Service screen.
- * @param {string} domain The domain name.
- */
- Oobe.setTermsOfServiceDomain = function(domain) {
- oobe.TermsOfServiceScreen.setDomain(domain);
- };
-
- /**
- * Displays an error message on the Terms of Service screen. Called when the
- * download of the Terms of Service has failed.
- */
- Oobe.setTermsOfServiceLoadError = function() {
- $('terms-of-service').classList.remove('tos-loading');
- $('terms-of-service').classList.add('error');
- };
-
- /**
- * Displays the given |termsOfService| on the Terms of Service screen.
- * @param {string} termsOfService The terms of service, as plain text.
- */
- Oobe.setTermsOfService = function(termsOfService) {
- oobe.TermsOfServiceScreen.setTermsOfService(termsOfService);
- };
-
- /**
- * Clears password field in user-pod.
- */
- Oobe.clearUserPodPassword = function() {
- DisplayManager.clearUserPodPassword();
- };
-
- // Export
+cr.define('cr.ui.Oobe', function() {
return {
- Oobe: Oobe
+ /**
+ * Initializes the OOBE flow. This will cause all C++ handlers to
+ * be invoked to do final setup.
+ */
+ initialize: function() {
+ cr.ui.login.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');
+ },
+
+ // Dummy Oobe functions not present with stripped login UI.
+ initializeA11yMenu: function(e) {},
+ handleAccessbilityLinkClick: function(e) {},
+ handleSpokenFeedbackClick: function(e) {},
+ handleHighContrastClick: function(e) {},
+ handleScreenMagnifierClick: function(e) {},
+ enableContinueButton: function(enable) {},
+ setUsageStats: function(checked) {},
+ setOemEulaUrl: function(oemEulaUrl) {},
+ setUpdateProgress: function(progress) {},
+ showUpdateEstimatedTimeLeft: function(enable) {},
+ setUpdateEstimatedTimeLeft: function(seconds) {},
+ setUpdateMessage: function(message) {},
+ showUpdateCurtain: function(enable) {},
+ setTpmPassword: function(password) {},
+ refreshA11yInfo: function(data) {},
+ reloadContent: function(data) {},
};
});
-var Oobe = cr.ui.Oobe;
-
-// Allow selection events on components with editable text (password field)
-// bug (http://code.google.com/p/chromium/issues/detail?id=125863)
-disableTextSelectAndDrag(function(e) {
- var src = e.target;
- return src instanceof HTMLTextAreaElement ||
- src instanceof HTMLInputElement &&
- /text|password|search/.test(src.type);
-});
-
document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize);
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/login_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698