chrome/browser/chromeos/login/screens/update_screen.h - Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/screens/update_screen.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/login/screens/terms_of_service_screen.h ('k') | chrome/browser/chromeos/login/screens/update_screen_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/update_screen.h

diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h

index f828ca03446d8278154eaff7e570cdc420e9e6de..024a70d2e4a7a753f85febae59286e7148849c67 100644

--- a/chrome/browser/chromeos/login/screens/update_screen.h

+++ b/chrome/browser/chromeos/login/screens/update_screen.h

@@ -39,15 +39,15 @@ class UpdateScreen: public UpdateEngineClient::Observer,

static UpdateScreen* Get(ScreenManager* manager);

// Overridden from WizardScreen.

- virtual void PrepareToShow() OVERRIDE;

- virtual void Show() OVERRIDE;

- virtual void Hide() OVERRIDE;

- virtual std::string GetName() const OVERRIDE;

+ virtual void PrepareToShow() override;

+ virtual void Show() override;

+ virtual void Hide() override;

+ virtual std::string GetName() const override;

// UpdateScreenActor::Delegate implementation:

- virtual void CancelUpdate() OVERRIDE;

- virtual void OnActorDestroyed(UpdateScreenActor* actor) OVERRIDE;

- virtual void OnConnectToNetworkRequested() OVERRIDE;

+ virtual void CancelUpdate() override;

+ virtual void OnActorDestroyed(UpdateScreenActor* actor) override;

+ virtual void OnConnectToNetworkRequested() override;

// Starts network check. Made virtual to simplify mocking.

virtual void StartNetworkCheck();

@@ -72,12 +72,12 @@ class UpdateScreen: public UpdateEngineClient::Observer,

// UpdateEngineClient::Observer implementation:

virtual void UpdateStatusChanged(

- const UpdateEngineClient::Status& status) OVERRIDE;

+ const UpdateEngineClient::Status& status) override;

// NetworkPortalDetector::Observer implementation:

virtual void OnPortalDetectionCompleted(

const NetworkState* network,

- const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;

+ const NetworkPortalDetector::CaptivePortalState& state) override;

private:

FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);