Implemented lazy portal detection.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       if (!network->online())
         RecordDiscrepancyWithShill(network, state.status);
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
       NOTREACHED();
       break;
   }
 }
 
+void EnableLazyDetection() {
+  NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
+  if (detector)
+    detector->EnableLazyDetection();
+}
+
+void DisableLazyDetection() {
+  NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
+  if (detector)
+    detector->DisableLazyDetection();
+}
+
 }  // namespace
 
 // SigninScreenHandler implementation ------------------------------------------
 
 SigninScreenHandler::SigninScreenHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer,
     ErrorScreenActor* error_screen_actor)
     : ui_state_(UI_STATE_UNKNOWN),
       delegate_(NULL),
       native_window_delegate_(NULL),
@@ skipping 376 matching lines @@
     bool offline_login_allowed = IsOfflineLoginAllowed() &&
         IsSigninScreenError(error_screen_actor_->state()) &&
         error_screen_actor_->state() != ErrorScreenActor::STATE_TIMEOUT_ERROR;
     error_screen_actor_->AllowOfflineLogin(offline_login_allowed);
 
     if (GetCurrentScreen() != OobeUI::SCREEN_ERROR_MESSAGE) {
       DictionaryValue params;
       params.SetInteger("lastNetworkType", static_cast<int>(connection_type));
       error_screen_actor_->Show(OobeUI::SCREEN_GAIA_SIGNIN, &params);
     }
+
+    EnableLazyDetection();
   } else {
     if (IsSigninScreenHiddenByError()) {
       LOG(WARNING) << "Hide offline message. state=" << state << ", "
                    << "network_id=" << network_id << ", "
                    << "reason=" << reason;
       error_screen_actor_->Hide();
 
       // Forces a reload for Gaia screen on hiding error message.
       if (is_gaia_signin && !is_gaia_reloaded) {
         ReloadGaiaScreen();
         is_gaia_reloaded = true;
       }
     }
+
+    DisableLazyDetection();
   }
 }
 
 void SigninScreenHandler::ReloadGaiaScreen() {
   LOG(WARNING) << "Reload auth extension frame.";
   web_ui()->CallJavascriptFunction("login.GaiaSigninScreen.doReload");
 }
 
 void SigninScreenHandler::ScheduleGaiaFrameReload() {
   LOG(WARNING) << "Shedule retry for auth extension frame.";
@@ skipping 1055 matching lines @@
   if (!cros_settings)
     return false;
 
   // Offline login is allowed only when user pods are hidden.
   bool show_pods;
   cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
   return !show_pods;
 }
 
 }  // namespace chromeos