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

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

Issue 10908095: Added fix that Gaia should be reloaded when proxy settings were changed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/screen_error_message.js
diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js
index 144374a613f6becf4a127631a523cdafd431e2c5..61dd100a16f6f7a4fc02b55179494fa25a85ad40 100644
--- a/chrome/browser/resources/chromeos/login/screen_error_message.js
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.js
@@ -161,11 +161,13 @@ cr.define('login', function() {
var isTimeout = false;
var isShown = !offlineMessage.classList.contains('hidden') &&
!offlineMessage.classList.contains('faded');
+ var currentScreenReloaded = false;
if (reason == ERROR_REASONS.PROXY_CONFIG_CHANGED && shouldOverlay &&
- isShown) {
+ !currentScreenReloaded) {
// Schedules a immediate retry.
currentScreen.doReload();
+ currentScreenReloaded = true;
console.log('Retry page load since proxy settings has been changed');
}
@@ -278,8 +280,10 @@ cr.define('login', function() {
Oobe.getInstance().updateInnerContainerSize_(currentScreen);
// Forces a reload for Gaia screen on hiding error message.
- if (currentScreen.id == 'gaia-signin')
+ if (currentScreen.id == 'gaia-signin' && !currentScreenReloaded) {
currentScreen.doReload();
+ currentScreenReloaded = true;
+ }
}
}
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698