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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 416493002: Fixed Gaia reloading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index c2415a2fe7b9b3bf60c6c2b0e14e50e75d8362be..6018ca87496282d7695b1f539357516bd55b67ec 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -182,9 +182,11 @@ void GaiaScreenHandler::UpdateGaia(const GaiaContext& context) {
CallJS("updateAuthExtension", params);
}
-void GaiaScreenHandler::ReloadGaia() {
- if (frame_state_ == FRAME_STATE_LOADING)
+void GaiaScreenHandler::ReloadGaia(bool force_reload) {
+ if (frame_state_ == FRAME_STATE_LOADING && !force_reload) {
+ VLOG(1) << "Skipping reloading of Gaia since gaia is loading.";
return;
+ }
NetworkStateInformer::State state = network_state_informer_->state();
if (state != NetworkStateInformer::ONLINE) {
VLOG(1) << "Skipping reloading of Gaia since network state="

Powered by Google App Engine
This is Rietveld 408576698