chrome/browser/ui/views/status_icons/status_icon_win.h - Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]*

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_icon_win.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 | « chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h ('k') | chrome/browser/ui/views/status_icons/status_tray_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b4010fe87fc2eeded3023c559c17b43afeeb8861..300bf0c8fed7ff08840221a5a19e0dd42f287559 100644

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

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

@@ -46,16 +46,16 @@ class StatusIconWin : public StatusIcon {

UINT message_id() const { return message_id_; }

// Overridden from StatusIcon:

- virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;

- virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;

+ virtual void SetImage(const gfx::ImageSkia& image) override;

+ virtual void SetToolTip(const base::string16& tool_tip) override;

virtual void DisplayBalloon(const gfx::ImageSkia& icon,

const base::string16& title,

- const base::string16& contents) OVERRIDE;

- virtual void ForceVisible() OVERRIDE;

+ const base::string16& contents) override;

+ virtual void ForceVisible() override;

protected:

// Overridden from StatusIcon:

- virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) OVERRIDE;

+ virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override;

private:

void InitIconData(NOTIFYICONDATA* icon_data);