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

Unified Diff: ash/system/tray/hover_highlight_view.h

Issue 685483004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/tray/fixed_sized_scroll_view.h ('k') | ash/system/tray/special_popup_row.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/hover_highlight_view.h
diff --git a/ash/system/tray/hover_highlight_view.h b/ash/system/tray/hover_highlight_view.h
index ffd83a2d08ef6450494d362341fc8a5b6ee6583f..2b736ceebd3435f36e7cf6f6125b4617e19359f9 100644
--- a/ash/system/tray/hover_highlight_view.h
+++ b/ash/system/tray/hover_highlight_view.h
@@ -24,7 +24,7 @@ class ViewClickListener;
class HoverHighlightView : public ActionableView {
public:
explicit HoverHighlightView(ViewClickListener* listener);
- virtual ~HoverHighlightView();
+ ~HoverHighlightView() override;
// Convenience function for adding an icon and a label. This also sets the
// accessible name.
@@ -61,24 +61,24 @@ class HoverHighlightView : public ActionableView {
protected:
// Overridden from views::View.
- virtual void GetAccessibleState(ui::AXViewState* state) override;
+ void GetAccessibleState(ui::AXViewState* state) override;
private:
// Sets the highlighted color on a text label if |hover| is set.
void SetHoverHighlight(bool hover);
// Overridden from ActionableView:
- virtual bool PerformAction(const ui::Event& event) override;
+ bool PerformAction(const ui::Event& event) override;
// Overridden from views::View.
- virtual gfx::Size GetPreferredSize() const override;
- virtual int GetHeightForWidth(int width) const override;
- virtual void OnMouseEntered(const ui::MouseEvent& event) override;
- virtual void OnMouseExited(const ui::MouseEvent& event) override;
- virtual void OnGestureEvent(ui::GestureEvent* event) override;
- virtual void OnEnabledChanged() override;
- virtual void OnPaintBackground(gfx::Canvas* canvas) override;
- virtual void OnFocus() override;
+ gfx::Size GetPreferredSize() const override;
+ int GetHeightForWidth(int width) const override;
+ void OnMouseEntered(const ui::MouseEvent& event) override;
+ void OnMouseExited(const ui::MouseEvent& event) override;
+ void OnGestureEvent(ui::GestureEvent* event) override;
+ void OnEnabledChanged() override;
+ void OnPaintBackground(gfx::Canvas* canvas) override;
+ void OnFocus() override;
ViewClickListener* listener_;
views::Label* text_label_;
« no previous file with comments | « ash/system/tray/fixed_sized_scroll_view.h ('k') | ash/system/tray/special_popup_row.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698