Revert of Removed dependency on the UI from the NetworkPortalDetector.

chrome/browser/chromeos/net/network_portal_detector_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 55 matching lines @@
 
   // NetworkPortalDetector implementation:
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void AddAndFireObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual CaptivePortalState GetCaptivePortalState(
       const std::string& service_path) OVERRIDE;
   virtual bool IsEnabled() OVERRIDE;
   virtual void Enable(bool start_detection) OVERRIDE;
   virtual bool StartDetectionIfIdle() OVERRIDE;
-  virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) OVERRIDE;
 
   // NetworkStateHandlerObserver implementation:
   virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
 
   // PortalDetectorStrategy::Delegate implementation:
   virtual int AttemptCount() OVERRIDE;
   virtual base::TimeTicks AttemptStartTime() OVERRIDE;
   virtual base::TimeTicks GetCurrentTimeTicks() OVERRIDE;
 
+  // ErrorScreen::Observer implementation:
+  virtual void OnErrorScreenShow() OVERRIDE;
+  virtual void OnErrorScreenHide() OVERRIDE;
+
  private:
   friend class NetworkPortalDetectorImplTest;
   friend class NetworkPortalDetectorImplBrowserTest;
 
   typedef std::string NetworkId;
   typedef base::hash_map<NetworkId, CaptivePortalState> CaptivePortalStateMap;
 
   enum State {
     // No portal check is running.
     STATE_IDLE = 0,
@@ skipping 34 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Stores captive portal state for a |network| and notifies observers.
   void OnDetectionCompleted(const NetworkState* network,
                             const CaptivePortalState& results);
 
   // Notifies observers that portal detection is completed for a |network|.
   void NotifyDetectionCompleted(const NetworkState* network,
                                 const CaptivePortalState& state);
 
+  // Updates current detection strategy according to the curren state:
+  // error screen, login screen or user session.
+  void UpdateCurrentStrategy();
+
+  // Sets current strategy according to |id|. If current detection id
+  // doesn't equal to |id|, detection is restarted.
+  void SetStrategy(PortalDetectorStrategy::StrategyId id);
+
   State state() const { return state_; }
 
   bool is_idle() const {
     return state_ == STATE_IDLE;
   }
   bool is_portal_check_pending() const {
     return state_ == STATE_PORTAL_CHECK_PENDING;
   }
   bool is_checking_for_portal() const {
     return state_ == STATE_CHECKING_FOR_PORTAL;
@@ skipping 69 matching lines @@
 
   // Number of already performed detection attempts.
   int attempt_count_;
 
   // Delay before next portal detection.
   base::TimeDelta next_attempt_delay_;
 
   // Current detection strategy.
   scoped_ptr<PortalDetectorStrategy> strategy_;
 
+  // True when error screen is displayed.
+  bool error_screen_displayed_;
+
   // UI notification controller about captive portal state.
   NetworkPortalNotificationController notification_controller_;
 
   content::NotificationRegistrar registrar_;
 
   // Test time ticks used by unit tests.
   base::TimeTicks time_ticks_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_