[cros] Captive portal dialog fixes.

chrome/browser/chromeos/login/captive_portal_view.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/captive_portal_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 272 matching lines @@
     DLOG(INFO) << kCaptivePortalStartURL << " vs " << url.spec();
     redirected_ = true;
     proxy_->OnRedirected();
   }
 }
 
 void CaptivePortalView::LoadingStateChanged(WebContents* source) {
   bool is_loading = source->IsLoading();
   UpdateReload(is_loading, false);
   command_updater_->UpdateCommandEnabled(IDC_STOP, is_loading);
-  if (!is_loading && !redirected_)
-    proxy_->OnOriginalURLLoaded();
+  // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.
+  // Disable this heuristic as it has false positives.
+  // Relying on just flimflam portal check to close dialog is fine.
+  /*if (!is_loading && !redirected_)

[Dmitry Polukhin, 2012/03/27 13:40:41]

Please use C++ comments.

[Nikita (slow), 2012/03/27 14:01:36]

Done.

+    proxy_->OnOriginalURLLoaded();*/
 }
 
 TabContentsWrapper* CaptivePortalView::GetTabContentsWrapper() const {
   return dom_view_->dom_contents();
 }
 
 InstantController* CaptivePortalView::GetInstant() {
   return NULL;
 }
 
@@ skipping 113 matching lines @@
 
 void CaptivePortalView::UpdateReload(bool is_loading, bool force) {
   if (reload_) {
     reload_->ChangeMode(
         is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
         force);
   }
 }
 
 }  // namespace chromeos