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

Side by Side Diff: ui/views/test/focus_manager_test.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/test/event_generator_delegate_mac.mm ('k') | ui/views/test/test_views.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TEST_FOCUS_MANAGER_TEST_H_ 5 #ifndef UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
6 #define UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_ 6 #define UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
7 7
8 #include "ui/views/focus/focus_manager.h" 8 #include "ui/views/focus/focus_manager.h"
9 #include "ui/views/focus/widget_focus_manager.h" 9 #include "ui/views/focus/widget_focus_manager.h"
10 #include "ui/views/test/views_test_base.h" 10 #include "ui/views/test/views_test_base.h"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 namespace views { 13 namespace views {
14 14
15 class FocusChangeListener; 15 class FocusChangeListener;
16 16
17 class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { 17 class FocusManagerTest : public ViewsTestBase, public WidgetDelegate {
18 public: 18 public:
19 FocusManagerTest(); 19 FocusManagerTest();
20 virtual ~FocusManagerTest(); 20 virtual ~FocusManagerTest();
21 21
22 // Convenience to obtain the focus manager for the test's hosting widget. 22 // Convenience to obtain the focus manager for the test's hosting widget.
23 FocusManager* GetFocusManager(); 23 FocusManager* GetFocusManager();
24 24
25 // Overridden from ViewsTestBase: 25 // Overridden from ViewsTestBase:
26 virtual void SetUp() OVERRIDE; 26 virtual void SetUp() override;
27 virtual void TearDown() OVERRIDE; 27 virtual void TearDown() override;
28 28
29 // Overridden from WidgetDelegate: 29 // Overridden from WidgetDelegate:
30 virtual View* GetContentsView() OVERRIDE; 30 virtual View* GetContentsView() override;
31 virtual Widget* GetWidget() OVERRIDE; 31 virtual Widget* GetWidget() override;
32 virtual const Widget* GetWidget() const OVERRIDE; 32 virtual const Widget* GetWidget() const override;
33 virtual void GetAccessiblePanes(std::vector<View*>* panes) OVERRIDE; 33 virtual void GetAccessiblePanes(std::vector<View*>* panes) override;
34 34
35 protected: 35 protected:
36 // Called after the Widget is initialized and the content view is added. 36 // Called after the Widget is initialized and the content view is added.
37 // Override to add controls to the layout. 37 // Override to add controls to the layout.
38 virtual void InitContentView(); 38 virtual void InitContentView();
39 39
40 void AddFocusChangeListener(FocusChangeListener* listener); 40 void AddFocusChangeListener(FocusChangeListener* listener);
41 void AddWidgetFocusChangeListener(WidgetFocusChangeListener* listener); 41 void AddWidgetFocusChangeListener(WidgetFocusChangeListener* listener);
42 42
43 // For testing FocusManager::RotatePaneFocus(). 43 // For testing FocusManager::RotatePaneFocus().
(...skipping 14 matching lines...) Expand all
58 class TestFocusChangeListener : public FocusChangeListener { 58 class TestFocusChangeListener : public FocusChangeListener {
59 public: 59 public:
60 TestFocusChangeListener(); 60 TestFocusChangeListener();
61 virtual ~TestFocusChangeListener(); 61 virtual ~TestFocusChangeListener();
62 62
63 const std::vector<ViewPair>& focus_changes() const { return focus_changes_; } 63 const std::vector<ViewPair>& focus_changes() const { return focus_changes_; }
64 void ClearFocusChanges(); 64 void ClearFocusChanges();
65 65
66 // Overridden from FocusChangeListener: 66 // Overridden from FocusChangeListener:
67 virtual void OnWillChangeFocus(View* focused_before, 67 virtual void OnWillChangeFocus(View* focused_before,
68 View* focused_now) OVERRIDE; 68 View* focused_now) override;
69 virtual void OnDidChangeFocus(View* focused_before, 69 virtual void OnDidChangeFocus(View* focused_before,
70 View* focused_now) OVERRIDE; 70 View* focused_now) override;
71 71
72 private: 72 private:
73 // A vector of which views lost/gained focus. 73 // A vector of which views lost/gained focus.
74 std::vector<ViewPair> focus_changes_; 74 std::vector<ViewPair> focus_changes_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(TestFocusChangeListener); 76 DISALLOW_COPY_AND_ASSIGN(TestFocusChangeListener);
77 }; 77 };
78 78
79 typedef std::pair<gfx::NativeView, gfx::NativeView> NativeViewPair; 79 typedef std::pair<gfx::NativeView, gfx::NativeView> NativeViewPair;
80 80
81 // Use to record widget focus change notifications. 81 // Use to record widget focus change notifications.
82 class TestWidgetFocusChangeListener : public WidgetFocusChangeListener { 82 class TestWidgetFocusChangeListener : public WidgetFocusChangeListener {
83 public: 83 public:
84 TestWidgetFocusChangeListener(); 84 TestWidgetFocusChangeListener();
85 virtual ~TestWidgetFocusChangeListener(); 85 virtual ~TestWidgetFocusChangeListener();
86 86
87 const std::vector<NativeViewPair>& focus_changes() const { 87 const std::vector<NativeViewPair>& focus_changes() const {
88 return focus_changes_; 88 return focus_changes_;
89 } 89 }
90 void ClearFocusChanges(); 90 void ClearFocusChanges();
91 91
92 // Overridden from WidgetFocusChangeListener: 92 // Overridden from WidgetFocusChangeListener:
93 virtual void OnNativeFocusChange(gfx::NativeView focused_before, 93 virtual void OnNativeFocusChange(gfx::NativeView focused_before,
94 gfx::NativeView focused_now) OVERRIDE; 94 gfx::NativeView focused_now) override;
95 95
96 private: 96 private:
97 // Pairs of (focused_before, focused_now) parameters we've received via calls 97 // Pairs of (focused_before, focused_now) parameters we've received via calls
98 // to OnNativeFocusChange(), in oldest-to-newest-received order. 98 // to OnNativeFocusChange(), in oldest-to-newest-received order.
99 std::vector<NativeViewPair> focus_changes_; 99 std::vector<NativeViewPair> focus_changes_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(TestWidgetFocusChangeListener); 101 DISALLOW_COPY_AND_ASSIGN(TestWidgetFocusChangeListener);
102 }; 102 };
103 103
104 } // namespace views 104 } // namespace views
105 105
106 #endif // UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_ 106 #endif // UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_
OLDNEW
« no previous file with comments | « ui/views/test/event_generator_delegate_mac.mm ('k') | ui/views/test/test_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698