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

Side by Side Diff: ui/views/controls/styled_label.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 unified diff | Download patch
« no previous file with comments | « ui/views/controls/slider_unittest.cc ('k') | ui/views/controls/styled_label_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 UI_VIEWS_CONTROLS_STYLED_LABEL_H_ 5 #ifndef UI_VIEWS_CONTROLS_STYLED_LABEL_H_
6 #define UI_VIEWS_CONTROLS_STYLED_LABEL_H_ 6 #define UI_VIEWS_CONTROLS_STYLED_LABEL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void SetDisplayedOnBackgroundColor(SkColor color); 84 void SetDisplayedOnBackgroundColor(SkColor color);
85 SkColor displayed_on_background_color() const { 85 SkColor displayed_on_background_color() const {
86 return displayed_on_background_color_; 86 return displayed_on_background_color_;
87 } 87 }
88 88
89 void set_auto_color_readability_enabled(bool auto_color_readability) { 89 void set_auto_color_readability_enabled(bool auto_color_readability) {
90 auto_color_readability_enabled_ = auto_color_readability; 90 auto_color_readability_enabled_ = auto_color_readability;
91 } 91 }
92 92
93 // View implementation: 93 // View implementation:
94 virtual gfx::Insets GetInsets() const OVERRIDE; 94 virtual gfx::Insets GetInsets() const override;
95 virtual int GetHeightForWidth(int w) const OVERRIDE; 95 virtual int GetHeightForWidth(int w) const override;
96 virtual void Layout() OVERRIDE; 96 virtual void Layout() override;
97 virtual void PreferredSizeChanged() OVERRIDE; 97 virtual void PreferredSizeChanged() override;
98 98
99 // LinkListener implementation: 99 // LinkListener implementation:
100 virtual void LinkClicked(Link* source, int event_flags) OVERRIDE; 100 virtual void LinkClicked(Link* source, int event_flags) override;
101 101
102 private: 102 private:
103 struct StyleRange { 103 struct StyleRange {
104 StyleRange(const gfx::Range& range, 104 StyleRange(const gfx::Range& range,
105 const RangeStyleInfo& style_info) 105 const RangeStyleInfo& style_info)
106 : range(range), 106 : range(range),
107 style_info(style_info) { 107 style_info(style_info) {
108 } 108 }
109 ~StyleRange() {} 109 ~StyleRange() {}
110 110
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // Controls whether the text is automatically re-colored to be readable on the 155 // Controls whether the text is automatically re-colored to be readable on the
156 // background. 156 // background.
157 bool auto_color_readability_enabled_; 157 bool auto_color_readability_enabled_;
158 158
159 DISALLOW_COPY_AND_ASSIGN(StyledLabel); 159 DISALLOW_COPY_AND_ASSIGN(StyledLabel);
160 }; 160 };
161 161
162 } // namespace views 162 } // namespace views
163 163
164 #endif // UI_VIEWS_CONTROLS_STYLED_LABEL_H_ 164 #endif // UI_VIEWS_CONTROLS_STYLED_LABEL_H_
OLDNEW
« no previous file with comments | « ui/views/controls/slider_unittest.cc ('k') | ui/views/controls/styled_label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698