ash/system/tray/hover_highlight_view.h - Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/

Side by Side Diff: ash/system/tray/hover_highlight_view.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 unified diff | Download patch

« no previous file with comments | « ash/system/tray/fixed_sized_scroll_view.h ('k') | ash/system/tray/media_security/multi_profile_media_tray_item.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_	5 #ifndef ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_

6 #define ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_	6 #define ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_

7	7

8 #include "ash/system/tray/actionable_view.h"	8 #include "ash/system/tray/actionable_view.h"

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 void set_default_color(SkColor color) { default_color_ = color; }	54 void set_default_color(SkColor color) { default_color_ = color; }

55 void set_text_highlight_color(SkColor c) { text_highlight_color_ = c; }	55 void set_text_highlight_color(SkColor c) { text_highlight_color_ = c; }

56 void set_text_default_color(SkColor color) { text_default_color_ = color; }	56 void set_text_default_color(SkColor color) { text_default_color_ = color; }

57	57

58 views::Label* text_label() { return text_label_; }	58 views::Label* text_label() { return text_label_; }

59	59

60 bool hover() const { return hover_; }	60 bool hover() const { return hover_; }

61	61

62 protected:	62 protected:

63 // Overridden from views::View.	63 // Overridden from views::View.

64 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;	64 virtual void GetAccessibleState(ui::AXViewState* state) override;

65	65

66 private:	66 private:

67 // Overridden from ActionableView:	67 // Overridden from ActionableView:

68 virtual bool PerformAction(const ui::Event& event) OVERRIDE;	68 virtual bool PerformAction(const ui::Event& event) override;

69	69

70 // Overridden from views::View.	70 // Overridden from views::View.

71 virtual gfx::Size GetPreferredSize() const OVERRIDE;	71 virtual gfx::Size GetPreferredSize() const override;

72 virtual int GetHeightForWidth(int width) const OVERRIDE;	72 virtual int GetHeightForWidth(int width) const override;

73 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;	73 virtual void OnMouseEntered(const ui::MouseEvent& event) override;

74 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;	74 virtual void OnMouseExited(const ui::MouseEvent& event) override;

75 virtual void OnEnabledChanged() OVERRIDE;	75 virtual void OnEnabledChanged() override;

76 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;	76 virtual void OnPaintBackground(gfx::Canvas* canvas) override;

77 virtual void OnFocus() OVERRIDE;	77 virtual void OnFocus() override;

78	78

79 ViewClickListener* listener_;	79 ViewClickListener* listener_;

80 views::Label* text_label_;	80 views::Label* text_label_;

81 SkColor highlight_color_;	81 SkColor highlight_color_;

82 SkColor default_color_;	82 SkColor default_color_;

83 SkColor text_highlight_color_;	83 SkColor text_highlight_color_;

84 SkColor text_default_color_;	84 SkColor text_default_color_;

85 bool hover_;	85 bool hover_;

86 bool expandable_;	86 bool expandable_;

87 bool checkable_;	87 bool checkable_;

88 bool checked_;	88 bool checked_;

89	89

90 DISALLOW_COPY_AND_ASSIGN(HoverHighlightView);	90 DISALLOW_COPY_AND_ASSIGN(HoverHighlightView);

91 };	91 };

92	92

93 } // namespace ash	93 } // namespace ash

94	94

95 #endif // ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_	95 #endif // ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_

OLD	NEW