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

Side by Side Diff: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

Issue 11496007: Fixed error screen behaviour when gaia frame loading is timed out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview Oobe signin screen implementation. 6 * @fileoverview Oobe signin screen implementation.
7 */ 7 */
8 8
9 cr.define('login', function() { 9 cr.define('login', function() {
10 // Gaia loading time after which portal check should be fired. 10 // Gaia loading time after which portal check should be fired.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 1000); 121 1000);
122 }, 122 },
123 123
124 /** 124 /**
125 * Handler for Gaia loading timeout. 125 * Handler for Gaia loading timeout.
126 * @private 126 * @private
127 */ 127 */
128 onLoadingTimeOut_: function() { 128 onLoadingTimeOut_: function() {
129 this.loadingTimer_ = undefined; 129 this.loadingTimer_ = undefined;
130 this.clearRetry_(); 130 this.clearRetry_();
131 $('error-message').showLoadingTimeoutError(); 131 chrome.send('showLoadingTimeoutError');
132 }, 132 },
133 133
134 /** 134 /**
135 * Clears loading timer. 135 * Clears loading timer.
136 * @private 136 * @private
137 */ 137 */
138 clearLoadingTimer_: function() { 138 clearLoadingTimer_: function() {
139 if (this.loadingTimer_) { 139 if (this.loadingTimer_) {
140 window.clearTimeout(this.loadingTimer_); 140 window.clearTimeout(this.loadingTimer_);
141 this.loadingTimer_ = undefined; 141 this.loadingTimer_ = undefined;
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 }; 468 };
469 469
470 GaiaSigninScreen.doReload = function() { 470 GaiaSigninScreen.doReload = function() {
471 $('gaia-signin').doReload(); 471 $('gaia-signin').doReload();
472 }; 472 };
473 473
474 return { 474 return {
475 GaiaSigninScreen: GaiaSigninScreen 475 GaiaSigninScreen: GaiaSigninScreen
476 }; 476 };
477 }); 477 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698