chrome/browser/ui/views/status_icons/status_tray_win.h - Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome.

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/ui/views/status_icons/status_tray_win.h

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

Patch Set: Rebase Created 5 years, 8 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/ui/views/status_icons/status_tray_state_changer_win.h ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/status_icons/status_tray_win.h

diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h

index e4271d6e04a293fe84bae400e88afa3ad7ce2bb4..260a366c7f88956ac1eb674b4a1ee0b1403c3b9a 100644

--- a/chrome/browser/ui/views/status_icons/status_tray_win.h

+++ b/chrome/browser/ui/views/status_icons/status_tray_win.h

@@ -28,7 +28,7 @@ class StatusTrayStateChangerProxy {

class StatusTrayWin : public StatusTray {

public:

StatusTrayWin();

- ~StatusTrayWin();

+ ~StatusTrayWin() override;

void UpdateIconVisibilityInBackground(StatusIconWin* status_icon);

@@ -38,10 +38,9 @@ class StatusTrayWin : public StatusTray {

protected:

// Overriden from StatusTray:

- virtual StatusIcon* CreatePlatformStatusIcon(StatusIconType type,

- const gfx::ImageSkia& image,

- const base::string16& tool_tip)

- override;

+ StatusIcon* CreatePlatformStatusIcon(StatusIconType type,

+ const gfx::ImageSkia& image,

+ const base::string16& tool_tip) override;

private:

FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest);