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

Side by Side Diff: ui/views/controls/single_split_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 unified diff | Download patch
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/single_split_view_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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_SINGLE_SPLIT_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
6 #define UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 13 matching lines...) Expand all
24 VERTICAL_SPLIT 24 VERTICAL_SPLIT
25 }; 25 };
26 26
27 static const char kViewClassName[]; 27 static const char kViewClassName[];
28 28
29 SingleSplitView(View* leading, 29 SingleSplitView(View* leading,
30 View* trailing, 30 View* trailing,
31 Orientation orientation, 31 Orientation orientation,
32 SingleSplitViewListener* listener); 32 SingleSplitViewListener* listener);
33 33
34 virtual void Layout() OVERRIDE; 34 virtual void Layout() override;
35 virtual const char* GetClassName() const OVERRIDE; 35 virtual const char* GetClassName() const override;
36 36
37 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 37 virtual void GetAccessibleState(ui::AXViewState* state) override;
38 38
39 // SingleSplitView's preferred size is the sum of the preferred widths 39 // SingleSplitView's preferred size is the sum of the preferred widths
40 // and the max of the heights. 40 // and the max of the heights.
41 virtual gfx::Size GetPreferredSize() const OVERRIDE; 41 virtual gfx::Size GetPreferredSize() const override;
42 42
43 // Overriden to return a resize cursor when over the divider. 43 // Overriden to return a resize cursor when over the divider.
44 virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; 44 virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
45 45
46 Orientation orientation() const { 46 Orientation orientation() const {
47 return is_horizontal_ ? HORIZONTAL_SPLIT : VERTICAL_SPLIT; 47 return is_horizontal_ ? HORIZONTAL_SPLIT : VERTICAL_SPLIT;
48 } 48 }
49 49
50 void set_orientation(Orientation orientation) { 50 void set_orientation(Orientation orientation) {
51 is_horizontal_ = orientation == HORIZONTAL_SPLIT; 51 is_horizontal_ = orientation == HORIZONTAL_SPLIT;
52 } 52 }
53 53
54 void set_divider_offset(int divider_offset) { 54 void set_divider_offset(int divider_offset) {
(...skipping 19 matching lines...) Expand all
74 // split view |bounds|, current divider offset and children visiblity. 74 // split view |bounds|, current divider offset and children visiblity.
75 // Does not change children view bounds. 75 // Does not change children view bounds.
76 void CalculateChildrenBounds(const gfx::Rect& bounds, 76 void CalculateChildrenBounds(const gfx::Rect& bounds,
77 gfx::Rect* leading_bounds, 77 gfx::Rect* leading_bounds,
78 gfx::Rect* trailing_bounds) const; 78 gfx::Rect* trailing_bounds) const;
79 79
80 void SetAccessibleName(const base::string16& name); 80 void SetAccessibleName(const base::string16& name);
81 81
82 protected: 82 protected:
83 // View overrides. 83 // View overrides.
84 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 84 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
85 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 85 virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
86 virtual void OnMouseCaptureLost() OVERRIDE; 86 virtual void OnMouseCaptureLost() override;
87 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 87 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
88 88
89 private: 89 private:
90 // This test calls OnMouse* functions. 90 // This test calls OnMouse* functions.
91 FRIEND_TEST_ALL_PREFIXES(SingleSplitViewTest, MouseDrag); 91 FRIEND_TEST_ALL_PREFIXES(SingleSplitViewTest, MouseDrag);
92 92
93 // Returns true if |x| or |y| is over the divider. 93 // Returns true if |x| or |y| is over the divider.
94 bool IsPointInDivider(const gfx::Point& p); 94 bool IsPointInDivider(const gfx::Point& p);
95 95
96 // Calculates the new |divider_offset| based on the changes of split view 96 // Calculates the new |divider_offset| based on the changes of split view
97 // bounds. 97 // bounds.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 // The accessible name of this view. 139 // The accessible name of this view.
140 base::string16 accessible_name_; 140 base::string16 accessible_name_;
141 141
142 DISALLOW_COPY_AND_ASSIGN(SingleSplitView); 142 DISALLOW_COPY_AND_ASSIGN(SingleSplitView);
143 }; 143 };
144 144
145 } // namespace views 145 } // namespace views
146 146
147 #endif // UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ 147 #endif // UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/single_split_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698