ash/system/chromeos/session/logout_confirmation_controller.h - Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash.

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: ash/system/chromeos/session/logout_confirmation_controller.h

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Workaround Created 5 years, 11 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 | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/session/logout_confirmation_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/session/logout_confirmation_controller.h

diff --git a/ash/system/chromeos/session/logout_confirmation_controller.h b/ash/system/chromeos/session/logout_confirmation_controller.h

index e24406933d09ab0626e2860ba3694ac268bd3e5a..39db0f6dc7ef5b696afc16f97c844d5c1446eacd 100644

--- a/ash/system/chromeos/session/logout_confirmation_controller.h

+++ b/ash/system/chromeos/session/logout_confirmation_controller.h

@@ -31,7 +31,7 @@ class ASH_EXPORT LogoutConfirmationController : public ShellObserver {

public:

// The |logout_closure| must be safe to call as long as |this| is alive.

explicit LogoutConfirmationController(const base::Closure& logout_closure);

- virtual ~LogoutConfirmationController();

+ ~LogoutConfirmationController() override;

base::TickClock* clock() const { return clock_.get(); }

@@ -43,7 +43,7 @@ class ASH_EXPORT LogoutConfirmationController : public ShellObserver {

void SetClockForTesting(scoped_ptr<base::TickClock> clock);

// ShellObserver:

- virtual void OnLockStateChanged(bool locked) override;

+ void OnLockStateChanged(bool locked) override;

// Called by the |dialog_| when the user confirms logout.

void OnLogoutConfirmed();