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/bubble/bubble_window_targeter.h" | 5 #include "ui/views/bubble/bubble_window_targeter.h" |
6 | 6 |
7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
8 #include "ui/aura/window_event_dispatcher.h" | 8 #include "ui/aura/window_event_dispatcher.h" |
9 #include "ui/events/event_utils.h" | 9 #include "ui/events/event_utils.h" |
10 #include "ui/views/bubble/bubble_border.h" | 10 #include "ui/views/bubble/bubble_border.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 }; | 86 }; |
87 | 87 |
88 TEST_F(BubbleWindowTargeterTest, HitTest) { | 88 TEST_F(BubbleWindowTargeterTest, HitTest) { |
89 ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow(); | 89 ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow(); |
90 ui::EventTargeter* targeter = root->GetEventTargeter(); | 90 ui::EventTargeter* targeter = root->GetEventTargeter(); |
91 aura::Window* bubble_window = bubble_widget()->GetNativeWindow(); | 91 aura::Window* bubble_window = bubble_widget()->GetNativeWindow(); |
92 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow(); | 92 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow(); |
93 | 93 |
94 { | 94 { |
95 bubble_delegate()->set_margins(gfx::Insets()); | 95 bubble_delegate()->set_margins(gfx::Insets()); |
96 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 96 ui::MouseEvent move1( |
97 bubble_bounds.origin(), ui::EventTimeForNow(), | 97 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(), |
98 ui::EF_NONE, ui::EF_NONE); | 98 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE, |
| 99 ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)); |
99 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 100 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
100 } | 101 } |
101 { | 102 { |
102 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); | 103 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); |
103 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 104 ui::MouseEvent move1( |
104 bubble_bounds.origin(), ui::EventTimeForNow(), | 105 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(), |
105 ui::EF_NONE, ui::EF_NONE); | 106 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE, |
| 107 ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)); |
106 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 108 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
107 } | 109 } |
108 | 110 |
109 bubble_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( | 111 bubble_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( |
110 new BubbleWindowTargeter(bubble_delegate()))); | 112 new BubbleWindowTargeter(bubble_delegate()))); |
111 { | 113 { |
112 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); | 114 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); |
113 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 115 ui::MouseEvent move1( |
114 bubble_bounds.origin(), ui::EventTimeForNow(), | 116 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(), |
115 ui::EF_NONE, ui::EF_NONE); | 117 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE, |
| 118 ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)); |
116 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 119 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
117 } | 120 } |
118 } | 121 } |
119 | 122 |
120 } // namespace views | 123 } // namespace views |
OLD | NEW |