Revert of Removed dependency on the UI from the NetworkPortalDetector.

chrome/browser/chromeos/net/network_portal_detector_impl.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/chromeos/net/network_portal_detector_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 138 matching lines @@
     "CaptivePortal.Session.PortalToOnlineTransition";
 
 NetworkPortalDetectorImpl::NetworkPortalDetectorImpl(
     const scoped_refptr<net::URLRequestContextGetter>& request_context)
     : state_(STATE_IDLE),
       test_url_(CaptivePortalDetector::kDefaultURL),
       enabled_(false),
       weak_factory_(this),
       attempt_count_(0),
       strategy_(PortalDetectorStrategy::CreateById(
-          PortalDetectorStrategy::STRATEGY_ID_COUNT)) {
+          PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN)),
+      error_screen_displayed_(false) {
   captive_portal_detector_.reset(new CaptivePortalDetector(request_context));
   strategy_->set_delegate(this);
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_PROXY_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_SUPPLIED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_CANCELLED,
                  content::NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
+                 content::NotificationService::AllSources());
 
   NetworkHandler::Get()->network_state_handler()->AddObserver(this, FROM_HERE);
-  SetStrategy(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN);
+  UpdateCurrentStrategy();
 }
 
 NetworkPortalDetectorImpl::~NetworkPortalDetectorImpl() {
   DCHECK(CalledOnValidThread());
 
   attempt_task_.Cancel();
   attempt_timeout_.Cancel();
 
   captive_portal_detector_->Cancel();
   captive_portal_detector_.reset();
@@ skipping 56 matching lines @@
   return it->second;
 }
 
 bool NetworkPortalDetectorImpl::StartDetectionIfIdle() {
   if (!is_idle())
     return false;
   StartDetection();
   return true;
 }
 
-void NetworkPortalDetectorImpl::SetStrategy(
-    PortalDetectorStrategy::StrategyId id) {
-  if (id == strategy_->Id())
-    return;
-  strategy_.reset(PortalDetectorStrategy::CreateById(id).release());
-  strategy_->set_delegate(this);
-  StopDetection();
-  StartDetectionIfIdle();
-}
-
 void NetworkPortalDetectorImpl::DefaultNetworkChanged(
     const NetworkState* default_network) {
   DCHECK(CalledOnValidThread());
 
   if (!default_network) {
     default_network_name_.clear();
     default_network_id_.clear();
 
     StopDetection();
 
@@ skipping 35 matching lines @@
 base::TimeTicks NetworkPortalDetectorImpl::AttemptStartTime() {
   return attempt_start_time_;
 }
 
 base::TimeTicks NetworkPortalDetectorImpl::GetCurrentTimeTicks() {
   if (time_ticks_for_testing_.is_null())
     return base::TimeTicks::Now();
   return time_ticks_for_testing_;
 }
 
+void NetworkPortalDetectorImpl::OnErrorScreenShow() {
+  error_screen_displayed_ = true;
+  UpdateCurrentStrategy();
+}
+
+void NetworkPortalDetectorImpl::OnErrorScreenHide() {
+  error_screen_displayed_ = false;
+  UpdateCurrentStrategy();
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkPortalDetectorImpl, private:
 
 void NetworkPortalDetectorImpl::StartDetection() {
   attempt_count_ = 0;
   DCHECK(CanPerformAttempt());
   detection_start_time_ = GetCurrentTimeTicks();
   ScheduleAttempt(base::TimeDelta());
 }
@@ skipping 136 matching lines @@
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_LOGIN_PROXY_CHANGED ||
       type == chrome::NOTIFICATION_AUTH_SUPPLIED ||
       type == chrome::NOTIFICATION_AUTH_CANCELLED) {
     VLOG(1) << "Restarting portal detection due to proxy change.";
     attempt_count_ = 0;
     if (is_portal_check_pending())
       return;
     StopDetection();
     ScheduleAttempt(base::TimeDelta::FromSeconds(kProxyChangeDelaySec));
+  } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
+    UpdateCurrentStrategy();
   }
 }
 
 void NetworkPortalDetectorImpl::OnDetectionCompleted(
     const NetworkState* network,
     const CaptivePortalState& state) {
   if (!network) {
     NotifyDetectionCompleted(network, state);
     return;
   }
@@ skipping 67 matching lines @@
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       if (network->connection_state() != shill::kStateOnline)
         RecordDiscrepancyWithShill(network, status);
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
       NOTREACHED();
       break;
   }
 }
 
+void NetworkPortalDetectorImpl::UpdateCurrentStrategy() {
+  if (InSession()) {
+    SetStrategy(PortalDetectorStrategy::STRATEGY_ID_SESSION);
+    return;
+  }
+  if (error_screen_displayed_) {
+    SetStrategy(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN);
+    return;
+  }
+  SetStrategy(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN);
+}
+
+void NetworkPortalDetectorImpl::SetStrategy(
+    PortalDetectorStrategy::StrategyId id) {
+  if (id == strategy_->Id())
+    return;
+  strategy_.reset(PortalDetectorStrategy::CreateById(id).release());
+  strategy_->set_delegate(this);
+  StopDetection();
+  StartDetectionIfIdle();
+}
+
 }  // namespace chromeos