Revert 268167 "Removed dependency on the UI from the NetworkPort..."

trunk/src/chrome/browser/chromeos/net/network_portal_detector_impl.cc

Index: trunk/src/chrome/browser/chromeos/net/network_portal_detector_impl.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/net/network_portal_detector_impl.cc	(revision 268189)
+++ trunk/src/chrome/browser/chromeos/net/network_portal_detector_impl.cc	(working copy)
@@ -156,7 +156,8 @@
       weak_factory_(this),
       attempt_count_(0),
       strategy_(PortalDetectorStrategy::CreateById(
-          PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN)) {
+          PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN)),
+      error_screen_displayed_(false) {
   captive_portal_detector_.reset(new CaptivePortalDetector(request_context));
   strategy_->set_delegate(this);
 
@@ -169,9 +170,12 @@
   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);
-  StartDetectionIfIdle();
+  UpdateCurrentStrategy();
 }
 
 NetworkPortalDetectorImpl::~NetworkPortalDetectorImpl() {
@@ -248,16 +252,6 @@
   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());
@@ -313,7 +307,16 @@
   return time_ticks_for_testing_;
 }
 
+void NetworkPortalDetectorImpl::OnErrorScreenShow() {
+  error_screen_displayed_ = true;
+  UpdateCurrentStrategy();
+}
 
+void NetworkPortalDetectorImpl::OnErrorScreenHide() {
+  error_screen_displayed_ = false;
+  UpdateCurrentStrategy();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkPortalDetectorImpl, private:
 
@@ -469,6 +472,8 @@
       return;
     StopDetection();
     ScheduleAttempt(base::TimeDelta::FromSeconds(kProxyChangeDelaySec));
+  } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
+    UpdateCurrentStrategy();
   }
 }
 
@@ -556,4 +561,26 @@
   }
 }
 
+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