Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: ui/message_center/views/notifier_settings_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
Index: ui/message_center/views/notifier_settings_view.h
diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h
index 994fa50a6e9f44a3b1bd74a1a533f746053f6ded..ef60a06ab4427dad1db713cf5d407e144edaa6d2 100644
--- a/ui/message_center/views/notifier_settings_view.h
+++ b/ui/message_center/views/notifier_settings_view.h
@@ -41,10 +41,10 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
// Overridden from NotifierSettingsDelegate:
virtual void UpdateIconImage(const NotifierId& notifier_id,
- const gfx::Image& icon) OVERRIDE;
- virtual void NotifierGroupChanged() OVERRIDE;
+ const gfx::Image& icon) override;
+ virtual void NotifierGroupChanged() override;
virtual void NotifierEnabledChanged(const NotifierId& notifier_id,
- bool enabled) OVERRIDE;
+ bool enabled) override;
void set_provider(NotifierSettingsProvider* new_provider) {
provider_ = new_provider;
@@ -72,8 +72,8 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
private:
// Overridden from views::ButtonListener:
virtual void ButtonPressed(views::Button* button,
- const ui::Event& event) OVERRIDE;
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+ const ui::Event& event) override;
+ virtual void GetAccessibleState(ui::AXViewState* state) override;
bool ShouldHaveLearnMoreButton() const;
// Helper function to reset the layout when the view has substantially
@@ -96,19 +96,19 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
void UpdateContentsView(const std::vector<Notifier*>& notifiers);
// Overridden from views::View:
- virtual void Layout() OVERRIDE;
- virtual gfx::Size GetMinimumSize() const OVERRIDE;
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
- virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
+ virtual void Layout() override;
+ virtual gfx::Size GetMinimumSize() const override;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
+ virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
// Overridden from views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
+ const ui::Event& event) override;
// Overridden from views::MenuButtonListener:
virtual void OnMenuButtonClicked(views::View* source,
- const gfx::Point& point) OVERRIDE;
+ const gfx::Point& point) override;
views::ImageButton* title_arrow_;
views::Label* title_label_;
« no previous file with comments | « ui/message_center/views/notification_view_unittest.cc ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698