Refactored error screen logic.

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 485 matching lines @@
           base::TimeDelta::FromSeconds(kConnectingTimeoutSec));
     }
     return;
   }
   connecting_closure_.Cancel();
 
   bool is_online = (state == NetworkStateInformer::ONLINE);
   bool is_under_captive_portal =
       (state == NetworkStateInformer::CAPTIVE_PORTAL);
   bool is_proxy_error = IsProxyError(state, reason);
-  bool is_timeout = (reason == ErrorScreenActor::kErrorReasonLoadingTimeout);
+  bool is_gaia_loading_timeout =
+      (reason == ErrorScreenActor::kErrorReasonLoadingTimeout);
   bool is_gaia_signin =
       (IsSigninScreen(GetCurrentScreen()) || IsSigninScreenHiddenByError()) &&
       ui_state_ == UI_STATE_GAIA_SIGNIN;
   bool is_gaia_reloaded = false;
   bool error_screen_should_overlay = !offline_login_active_ && IsGaiaLogin();
 
   // Reload frame if network is changed.
   if (reason == ErrorScreenActor::kErrorReasonNetworkChanged) {
     if (is_online &&
         last_network_state_ != NetworkStateInformer::ONLINE &&
         is_gaia_signin && !is_gaia_reloaded) {
       // Schedules a immediate retry.
       LOG(WARNING) << "Retry page load since network has been changed.";
       ReloadGaiaScreen();
       is_gaia_reloaded = true;
     }
   }
   last_network_state_ = state;
 
   if (reason == ErrorScreenActor::kErrorReasonProxyConfigChanged &&
       error_screen_should_overlay &&
       is_gaia_signin && !is_gaia_reloaded) {
     // Schedules a immediate retry.
     LOG(WARNING) << "Retry page load since proxy settings has been changed.";
     ReloadGaiaScreen();
     is_gaia_reloaded = true;
   }
 
-  // Fake portal state for loading timeout.
-  if (reason == ErrorScreenActor::kErrorReasonLoadingTimeout) {
+  if (reason == ErrorScreenActor::kErrorReasonLoadingTimeout)
     is_online = false;
-    is_under_captive_portal = true;
-  }
 
   // Portal was detected via generate_204 redirect on Chrome side.
   // Subsequent call to show dialog if it's already shown does nothing.
   if (reason == ErrorScreenActor::kErrorReasonPortalDetected) {
     is_online = false;
     is_under_captive_portal = true;
   }
 
+  if (is_online || !is_under_captive_portal)
+    error_screen_actor_->HideCaptivePortal();
+
   if (!is_online && is_gaia_signin && !offline_login_active_) {
     LOG(WARNING) << "Show offline message: state=" << state << ", "
                  << "network_id=" << network_id << ", "
                  << "reason=" << reason << ", "
                  << "is_under_captive_portal=" << is_under_captive_portal;
-    if (is_under_captive_portal && !is_proxy_error) {
+    if (is_proxy_error) {
+      error_screen_actor_->ShowProxyError();
+    } else if (is_under_captive_portal) {
       // Do not bother a user with obsessive captive portal showing. This
       // check makes captive portal being shown only once: either when error
       // screen is shown for the first time or when switching from another
       // error screen (offline, proxy).
       if (!IsGaiaLogin() ||
           (error_screen_actor_->state() !=
            ErrorScreenActor::STATE_CAPTIVE_PORTAL_ERROR)) {
-        // In case of timeout we're suspecting that network might be
-        // a captive portal but would like to check that first.
-        // Otherwise (signal from shill / generate_204 got redirected)
-        // show dialog right away.
-        if (is_timeout)
-          error_screen_actor_->FixCaptivePortal();
-        else
-          error_screen_actor_->ShowCaptivePortal();
+        error_screen_actor_->FixCaptivePortal();
       }
-    } else {
-      error_screen_actor_->HideCaptivePortal();
-    }
-
-    if (is_under_captive_portal) {
-      if (is_proxy_error) {
-        error_screen_actor_->ShowProxyError();
-      } else {
-        std::string network_name = GetNetworkName(service_path);
-        error_screen_actor_->ShowCaptivePortalError(network_name);
-      }
-    } else if (is_proxy_error) {
-      error_screen_actor_->ShowProxyError();
+      std::string network_name = GetNetworkName(service_path);
+      error_screen_actor_->ShowCaptivePortalError(network_name);
+    } else if (is_gaia_loading_timeout) {
+      error_screen_actor_->ShowTimeoutError();
     } else {
       error_screen_actor_->ShowOfflineError();
     }
 
     bool guest_signin_allowed = IsGuestSigninAllowed() &&
         IsSigninScreenError(error_screen_actor_->state());
     error_screen_actor_->AllowGuestSignin(guest_signin_allowed);
 
     bool offline_login_allowed = IsOfflineLoginAllowed() &&
         IsSigninScreenError(error_screen_actor_->state());
     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);
     }
   } else {
-    error_screen_actor_->HideCaptivePortal();
-
     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;
@@ skipping 1060 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