[cros] Captive portal dialog fixes.

chrome/browser/resources/chromeos/login/screen_error_message.js

  // Copyright (c) 2012 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.
 
 /**
  * @fileoverview Offline message screen implementation.
  */
 
 cr.define('login', function() {
   // Screens that should have offline message overlay.
@@ skipping 62 matching lines @@
     /**
      * Updates localized content of the screen that is not updated via template.
      */
     updateLocalizedContent_: function() {
       $('captive-portal-message-text').innerHTML = localStrings.getStringF(
         'captivePortalMessage',
         '<b id="' + CURRENT_NETWORK_NAME_ID + '"></b>',
         '<a id="' + FIX_CAPTIVE_PORTAL_ID + '" class="signin-link" href="#">',
         '</a>');
       $(FIX_CAPTIVE_PORTAL_ID).onclick = function() {
-        chrome.send('fixCaptivePortal');
+        chrome.send('showCaptivePortal');
       };
 
       $('proxy-message-text').innerHTML = localStrings.getStringF(
           'proxyMessageText',
           '<a id="' + RELOAD_PAGE_ID + '" class="signin-link" href="#">',
           '</a>');
       $(RELOAD_PAGE_ID).onclick = function() {
         var currentScreen = Oobe.getInstance().currentScreen;
         // Schedules a immediate retry.
         currentScreen.doReload();
@@ skipping 46 matching lines @@
      */
     updateState_: function(state, network, reason, lastNetworkType) {
       var currentScreen = Oobe.getInstance().currentScreen;
       var offlineMessage = this;
       var isOnline = (state == NET_STATE.ONLINE);
       var isUnderCaptivePortal = (state == NET_STATE.PORTAL);
       var isProxyError = reason == ERROR_REASONS.PROXY_AUTH_CANCELLED ||
           reason == ERROR_REASONS.PROXY_CONNECTION_FAILED;
       var shouldOverlay = MANAGED_SCREENS.indexOf(currentScreen.id) != -1 &&
           !currentScreen.isLocal;
+      var isTimeout = false;
 
       if (reason == ERROR_REASONS.PROXY_CONFIG_CHANGED && shouldOverlay &&
           !offlineMessage.classList.contains('hidden') &&
           offlineMessage.classList.contains('show-captive-portal')) {
         // Schedules a immediate retry.
         currentScreen.doReload();
         console.log('Retry page load since proxy settings has been changed');
       }
 
       // Fake portal state for loading timeout.
       if (reason == ERROR_REASONS.LOADING_TIMEOUT) {
         isOnline = false;
         isUnderCaptivePortal = true;
+        isTimeout = 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 == ERROR_REASONS.PORTAL_DETECTED) {
         isOnline = false;
         isUnderCaptivePortal = true;
       }
 
       if (!isOnline && shouldOverlay) {
         console.log('Show offline message: state=' + state +
                     ', network=' + network + ', reason=' + reason,
                     ', isUnderCaptivePortal=' + isUnderCaptivePortal);
 
 
         offlineMessage.onBeforeShow(lastNetworkType);
 
-        if (isUnderCaptivePortal && !isProxyError)
-          chrome.send('fixCaptivePortal');
-        else
+        if (isUnderCaptivePortal && !isProxyError) {
+          // In case of timeout we're suspecting that network might be
+          // a captive portal but would like to check that first.
+          // Otherwise (signal from flimflam / generate_204 got redirected)
+          // show dialog right away.
+          if (isTimeout)
+            chrome.send('fixCaptivePortal');
+          else
+            chrome.send('showCaptivePortal');
+        } else {
           chrome.send('hideCaptivePortal');
+        }
 
         if (isUnderCaptivePortal) {
           if (isProxyError) {
             offlineMessage.classList.remove('show-offline-message');
             offlineMessage.classList.remove('show-captive-portal');
             offlineMessage.classList.add('show-proxy-error');
           } else {
             $(CURRENT_NETWORK_NAME_ID).textContent = network;
             offlineMessage.classList.remove('show-offline-message');
             offlineMessage.classList.remove('show-proxy-error');
@@ skipping 117 matching lines @@
    * via template.
    */
   ErrorMessageScreen.updateLocalizedContent = function() {
     $('error-message').updateLocalizedContent_();
   };
 
   return {
     ErrorMessageScreen: ErrorMessageScreen
   };
 });