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

Side by Side Diff: ui/message_center/views/bounded_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/message_center/test/run_all_unittests.cc ('k') | ui/message_center/views/bounded_label.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_MESSAGE_CENTER_BOUNDED_LABEL_H_ 5 #ifndef UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
6 #define UI_MESSAGE_CENTER_BOUNDED_LABEL_H_ 6 #define UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 void SetText(const base::string16& text); // Additionally clears caches. 43 void SetText(const base::string16& text); // Additionally clears caches.
44 44
45 int GetLineHeight() const; 45 int GetLineHeight() const;
46 int GetLineLimit() const; 46 int GetLineLimit() const;
47 47
48 // Pass in a -1 width to use the preferred width, a -1 limit to skip limits. 48 // Pass in a -1 width to use the preferred width, a -1 limit to skip limits.
49 int GetLinesForWidthAndLimit(int width, int limit); 49 int GetLinesForWidthAndLimit(int width, int limit);
50 gfx::Size GetSizeForWidthAndLines(int width, int lines); 50 gfx::Size GetSizeForWidthAndLines(int width, int lines);
51 51
52 // views::View: 52 // views::View:
53 virtual int GetBaseline() const OVERRIDE; 53 virtual int GetBaseline() const override;
54 virtual gfx::Size GetPreferredSize() const OVERRIDE; 54 virtual gfx::Size GetPreferredSize() const override;
55 virtual int GetHeightForWidth(int width) const OVERRIDE; 55 virtual int GetHeightForWidth(int width) const override;
56 virtual void Paint(gfx::Canvas* canvas, 56 virtual void Paint(gfx::Canvas* canvas,
57 const views::CullSet& cull_set) OVERRIDE; 57 const views::CullSet& cull_set) override;
58 virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; 58 virtual bool CanProcessEventsWithinSubtree() const override;
59 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 59 virtual void GetAccessibleState(ui::AXViewState* state) override;
60 60
61 protected: 61 protected:
62 // Overridden from views::View. 62 // Overridden from views::View.
63 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 63 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
64 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; 64 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
65 65
66 private: 66 private:
67 friend class test::BoundedLabelTest; 67 friend class test::BoundedLabelTest;
68 68
69 base::string16 GetWrappedTextForTest(int width, int lines); 69 base::string16 GetWrappedTextForTest(int width, int lines);
70 70
71 scoped_ptr<InnerBoundedLabel> label_; 71 scoped_ptr<InnerBoundedLabel> label_;
72 int line_limit_; 72 int line_limit_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(BoundedLabel); 74 DISALLOW_COPY_AND_ASSIGN(BoundedLabel);
75 }; 75 };
76 76
77 } // namespace message_center 77 } // namespace message_center
78 78
79 #endif // UI_MESSAGE_CENTER_BOUNDED_LABEL_H_ 79 #endif // UI_MESSAGE_CENTER_BOUNDED_LABEL_H_
OLDNEW
« no previous file with comments | « ui/message_center/test/run_all_unittests.cc ('k') | ui/message_center/views/bounded_label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698