OLD | NEW |
---|---|
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 #include "ui/views/test/focus_manager_test.h" | 5 #include "ui/views/test/focus_manager_test.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ui/views/focus/focus_manager.h" | 9 #include "ui/views/focus/focus_manager.h" |
10 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
(...skipping 23 matching lines...) Expand all Loading... | |
34 ViewsTestBase::SetUp(); | 34 ViewsTestBase::SetUp(); |
35 | 35 |
36 Widget* widget = new Widget; | 36 Widget* widget = new Widget; |
37 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); | 37 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
38 params.delegate = this; | 38 params.delegate = this; |
39 params.bounds = gfx::Rect(0, 0, 1024, 768); | 39 params.bounds = gfx::Rect(0, 0, 1024, 768); |
40 widget->Init(params); | 40 widget->Init(params); |
41 | 41 |
42 InitContentView(); | 42 InitContentView(); |
43 widget->Show(); | 43 widget->Show(); |
44 | |
45 // By default test with full keyboard accessibility on Mac. | |
tapted
2016/04/20 06:05:58
(should be unnecessary with a much earlier comment
| |
46 #if defined(OS_MACOSX) | |
47 GetFocusManager()->SetKeyboardAccessible(true); | |
48 #endif | |
44 } | 49 } |
45 | 50 |
46 void FocusManagerTest::TearDown() { | 51 void FocusManagerTest::TearDown() { |
47 if (focus_change_listener_) | 52 if (focus_change_listener_) |
48 GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_); | 53 GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_); |
49 if (widget_focus_change_listener_) { | 54 if (widget_focus_change_listener_) { |
50 WidgetFocusManager::GetInstance()->RemoveFocusChangeListener( | 55 WidgetFocusManager::GetInstance()->RemoveFocusChangeListener( |
51 widget_focus_change_listener_); | 56 widget_focus_change_listener_); |
52 } | 57 } |
53 GetWidget()->Close(); | 58 GetWidget()->Close(); |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 void TestWidgetFocusChangeListener::ClearFocusChanges() { | 138 void TestWidgetFocusChangeListener::ClearFocusChanges() { |
134 focus_changes_.clear(); | 139 focus_changes_.clear(); |
135 } | 140 } |
136 | 141 |
137 void TestWidgetFocusChangeListener::OnNativeFocusChanged( | 142 void TestWidgetFocusChangeListener::OnNativeFocusChanged( |
138 gfx::NativeView focused_now) { | 143 gfx::NativeView focused_now) { |
139 focus_changes_.push_back(focused_now); | 144 focus_changes_.push_back(focused_now); |
140 } | 145 } |
141 | 146 |
142 } // namespace views | 147 } // namespace views |
OLD | NEW |