| Index: chrome/browser/chromeos/net/network_portal_detector_impl.h
|
| diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h
|
| index bf9070bf6c5d19611e3b2357ddfec766e64dc34b..b02f1e25f929a005f599ec551b2cd7b500bf06df 100644
|
| --- a/chrome/browser/chromeos/net/network_portal_detector_impl.h
|
| +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h
|
| @@ -65,26 +65,25 @@ class NetworkPortalDetectorImpl
|
|
|
| explicit NetworkPortalDetectorImpl(
|
| const scoped_refptr<net::URLRequestContextGetter>& request_context);
|
| - virtual ~NetworkPortalDetectorImpl();
|
| + ~NetworkPortalDetectorImpl() override;
|
|
|
| // 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& guid) override;
|
| - virtual bool IsEnabled() override;
|
| - virtual void Enable(bool start_detection) override;
|
| - virtual bool StartDetectionIfIdle() override;
|
| - virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) override;
|
| + void AddObserver(Observer* observer) override;
|
| + void AddAndFireObserver(Observer* observer) override;
|
| + void RemoveObserver(Observer* observer) override;
|
| + CaptivePortalState GetCaptivePortalState(const std::string& guid) override;
|
| + bool IsEnabled() override;
|
| + void Enable(bool start_detection) override;
|
| + bool StartDetectionIfIdle() override;
|
| + void SetStrategy(PortalDetectorStrategy::StrategyId id) override;
|
|
|
| // NetworkStateHandlerObserver implementation:
|
| - virtual void DefaultNetworkChanged(const NetworkState* network) override;
|
| + void DefaultNetworkChanged(const NetworkState* network) override;
|
|
|
| // PortalDetectorStrategy::Delegate implementation:
|
| - virtual int NoResponseResultCount() override;
|
| - virtual base::TimeTicks AttemptStartTime() override;
|
| - virtual base::TimeTicks GetCurrentTimeTicks() override;
|
| + int NoResponseResultCount() override;
|
| + base::TimeTicks AttemptStartTime() override;
|
| + base::TimeTicks GetCurrentTimeTicks() override;
|
|
|
| private:
|
| friend class NetworkPortalDetectorImplTest;
|
| @@ -141,9 +140,9 @@ class NetworkPortalDetectorImpl
|
| const captive_portal::CaptivePortalDetector::Results& results);
|
|
|
| // content::NotificationObserver implementation:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| // Stores captive portal state for a |network| and notifies observers.
|
| void OnDetectionCompleted(const NetworkState* network,
|
|
|