chrome/browser/chromeos/net/network_portal_detector_impl.h - Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

Unified Diff: chrome/browser/chromeos/net/network_portal_detector_impl.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc ('k') | chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9fdedbecf293b7670c2ab4b53da2e4b440835618..bf9070bf6c5d19611e3b2357ddfec766e64dc34b 100644

--- a/chrome/browser/chromeos/net/network_portal_detector_impl.h

+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h

@@ -68,23 +68,23 @@ class NetworkPortalDetectorImpl

virtual ~NetworkPortalDetectorImpl();

// NetworkPortalDetector implementation:

- virtual void AddObserver(Observer* observer) OVERRIDE;

- virtual void AddAndFireObserver(Observer* observer) OVERRIDE;

- virtual void RemoveObserver(Observer* observer) OVERRIDE;

+ 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;

+ 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;

// NetworkStateHandlerObserver implementation:

- virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;

+ virtual void DefaultNetworkChanged(const NetworkState* network) override;

// PortalDetectorStrategy::Delegate implementation:

- virtual int NoResponseResultCount() OVERRIDE;

- virtual base::TimeTicks AttemptStartTime() OVERRIDE;

- virtual base::TimeTicks GetCurrentTimeTicks() OVERRIDE;

+ virtual int NoResponseResultCount() override;

+ virtual base::TimeTicks AttemptStartTime() override;

+ virtual base::TimeTicks GetCurrentTimeTicks() override;

private:

friend class NetworkPortalDetectorImplTest;

@@ -143,7 +143,7 @@ class NetworkPortalDetectorImpl

// content::NotificationObserver implementation:

virtual void Observe(int type,

const content::NotificationSource& source,

- const content::NotificationDetails& details) OVERRIDE;

+ const content::NotificationDetails& details) override;

// Stores captive portal state for a |network| and notifies observers.

void OnDetectionCompleted(const NetworkState* network,