diff options
| author | achuith <achuith@chromium.org> | 2015-09-15 20:10:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 03:11:35 +0000 |
| commit | c1ba41aa3ec4937e607f50045ba7a358a2030cc0 (patch) | |
| tree | e343ba29cff4e2b691b075acf253256849cd89a7 /chromeos/network | |
| parent | 8b834a342b234711bfab2ec1a025d4712a38af20 (diff) | |
| download | chromium_src-c1ba41aa3ec4937e607f50045ba7a358a2030cc0.zip chromium_src-c1ba41aa3ec4937e607f50045ba7a358a2030cc0.tar.gz chromium_src-c1ba41aa3ec4937e607f50045ba7a358a2030cc0.tar.bz2 | |
Remove SupportsWeakPtr in NetworkPortalNotificationController.
Additional owners for NetworkPortalDetector
Other minor fixes.
BUG=530485
Review URL: https://codereview.chromium.org/1346763002
Cr-Commit-Position: refs/heads/master@{#349077}
Diffstat (limited to 'chromeos/network')
3 files changed, 5 insertions, 7 deletions
diff --git a/chromeos/network/portal_detector/OWNERS b/chromeos/network/portal_detector/OWNERS index 2dcc458..dccd40f 100644 --- a/chromeos/network/portal_detector/OWNERS +++ b/chromeos/network/portal_detector/OWNERS @@ -1 +1,3 @@ +achuith@chromium.org alemate@chromium.org +stevenjb@chromium.org diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.cc b/chromeos/network/portal_detector/network_portal_detector_strategy.cc index 50b32c2..c45466f 100644 --- a/chromeos/network/portal_detector/network_portal_detector_strategy.cc +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.cc @@ -132,7 +132,7 @@ PortalDetectorStrategy::PortalDetectorStrategy(Delegate* delegate) PortalDetectorStrategy::~PortalDetectorStrategy() { } -// statc +// static scoped_ptr<PortalDetectorStrategy> PortalDetectorStrategy::CreateById( StrategyId id, Delegate* delegate) { @@ -148,7 +148,7 @@ scoped_ptr<PortalDetectorStrategy> PortalDetectorStrategy::CreateById( default: NOTREACHED(); return scoped_ptr<PortalDetectorStrategy>( - static_cast<PortalDetectorStrategy*>(NULL)); + static_cast<PortalDetectorStrategy*>(nullptr)); } } @@ -178,8 +178,4 @@ void PortalDetectorStrategy::OnDetectionCompleted() { backoff_entry_->InformOfRequest(false); } -base::TimeDelta PortalDetectorStrategy::GetNextAttemptTimeoutImpl() { - return base::TimeDelta(); -} - } // namespace chromeos diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.h b/chromeos/network/portal_detector/network_portal_detector_strategy.h index 3b8b5d3..84d4853 100644 --- a/chromeos/network/portal_detector/network_portal_detector_strategy.h +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.h @@ -68,7 +68,7 @@ class CHROMEOS_EXPORT PortalDetectorStrategy { explicit PortalDetectorStrategy(Delegate* delegate); // Interface for subclasses: - virtual base::TimeDelta GetNextAttemptTimeoutImpl(); + virtual base::TimeDelta GetNextAttemptTimeoutImpl() = 0; Delegate* delegate_; net::BackoffEntry::Policy policy_; |