ash/system/chromeos/session/logout_button_tray.h - Issue 621133002: replace OVERRIDE and FINAL with override and final 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_button_tray.h

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

Patch Set: 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 | « ash/system/chromeos/session/last_window_closed_logout_reminder.h ('k') | ash/system/chromeos/session/logout_confirmation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8c40c2a898d88a877e13df051f00a1bf80d22302..f581bea298abe317ceed8297a52c9bc3306dee25 100644

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

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

@@ -31,19 +31,19 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,

virtual ~LogoutButtonTray();

// TrayBackgroundView:

- virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;

- virtual base::string16 GetAccessibleNameForTray() OVERRIDE;

+ virtual void SetShelfAlignment(ShelfAlignment alignment) override;

+ virtual base::string16 GetAccessibleNameForTray() override;

virtual void HideBubbleWithView(

- const views::TrayBubbleView* bubble_view) OVERRIDE;

- virtual bool ClickedOutsideBubble() OVERRIDE;

+ const views::TrayBubbleView* bubble_view) override;

+ virtual bool ClickedOutsideBubble() override;

// LogoutButtonObserver:

- virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE;

- virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) OVERRIDE;

+ virtual void OnShowLogoutButtonInTrayChanged(bool show) override;

+ virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) override;

// views::ButtonListener:

virtual void ButtonPressed(views::Button* sender,

- const ui::Event& event) OVERRIDE;

+ const ui::Event& event) override;

void UpdateAfterLoginStatusChange(user::LoginStatus login_status);