summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 13:04:29 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 13:04:29 +0000
commitbf0aa27340c2364aa4be3549e870c71ce0846d7a (patch)
tree832a31223205b31e7cc267efedc3ad75064a3d82 /ui
parent362c26e077426fddd926f3d9d1ad4436aca25e2c (diff)
downloadchromium_src-bf0aa27340c2364aa4be3549e870c71ce0846d7a.zip
chromium_src-bf0aa27340c2364aa4be3549e870c71ce0846d7a.tar.gz
chromium_src-bf0aa27340c2364aa4be3549e870c71ce0846d7a.tar.bz2
Revert 167593 - Add an OVERRIDE keyword
This change adds an OVERRIDE keyword to the BaseFormatView::ButtonPressed function to fix a build break on the "Linux ChromiumOS (Clang dbg)" bot. The CL this tries to fix is broken. Reverting the fix, so I can revert the CL TBR=miket BUG=none TEST=fix builds on the "Linux ChromiumOS (Clang dbg)" bot and the "Linux Chromium OS ASAN Builder" bot. Review URL: https://codereview.chromium.org/11410077 TBR=hbono@chromium.org Review URL: https://codereview.chromium.org/11363241 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/message_center/base_format_view.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/message_center/base_format_view.h b/ui/message_center/base_format_view.h
index d0cafaf..131521a 100644
--- a/ui/message_center/base_format_view.h
+++ b/ui/message_center/base_format_view.h
@@ -25,8 +25,7 @@ class BaseFormatView : public MessageView {
virtual void SetUpView() OVERRIDE;
// views::ButtonListener
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
+ virtual void ButtonPressed(views::Button* sender, const ui::Event& event);
protected:
BaseFormatView();