| Index: chromeos/network/portal_detector/network_portal_detector_strategy.cc
|
| diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.cc b/chromeos/network/portal_detector/network_portal_detector_strategy.cc
|
| index dc9942b141102b9eda50518e222c8a1aede20f5d..5dd4590b32d7e6a51c6262613761fe03335b8517 100644
|
| --- a/chromeos/network/portal_detector/network_portal_detector_strategy.cc
|
| +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.cc
|
| @@ -28,8 +28,8 @@ class LoginScreenStrategy : public PortalDetectorStrategy {
|
|
|
| protected:
|
| // PortalDetectorStrategy overrides:
|
| - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_LOGIN_SCREEN; }
|
| - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE {
|
| + virtual StrategyId Id() const override { return STRATEGY_ID_LOGIN_SCREEN; }
|
| + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override {
|
| if (DefaultNetwork() && delegate_->NoResponseResultCount() != 0) {
|
| int timeout = kMaxAttemptTimeoutSec;
|
| if (kMaxAttemptTimeoutSec / (delegate_->NoResponseResultCount() + 1) >
|
| @@ -56,8 +56,8 @@ class ErrorScreenStrategy : public PortalDetectorStrategy {
|
|
|
| protected:
|
| // PortalDetectorStrategy overrides:
|
| - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_ERROR_SCREEN; }
|
| - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE {
|
| + virtual StrategyId Id() const override { return STRATEGY_ID_ERROR_SCREEN; }
|
| + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override {
|
| return base::TimeDelta::FromSeconds(kAttemptTimeoutSec);
|
| }
|
|
|
| @@ -76,8 +76,8 @@ class SessionStrategy : public PortalDetectorStrategy {
|
| virtual ~SessionStrategy() {}
|
|
|
| protected:
|
| - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_SESSION; }
|
| - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE {
|
| + virtual StrategyId Id() const override { return STRATEGY_ID_SESSION; }
|
| + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override {
|
| int timeout;
|
| if (delegate_->NoResponseResultCount() < kMaxFastAttempts)
|
| timeout = kFastAttemptTimeoutSec;
|
| @@ -102,7 +102,7 @@ class PortalDetectorStrategy::BackoffEntryImpl : public net::BackoffEntry {
|
| virtual ~BackoffEntryImpl() {}
|
|
|
| // net::BackoffEntry overrides:
|
| - virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE {
|
| + virtual base::TimeTicks ImplGetTimeNow() const override {
|
| return delegate_->GetCurrentTimeTicks();
|
| }
|
|
|
|
|