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

Side by Side Diff: ui/views/bubble/bubble_window_targeter_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor Created 3 years, 8 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
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 #include "ui/views/bubble/bubble_window_targeter.h" 5 #include "ui/views/bubble/bubble_window_targeter.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura/window_event_dispatcher.h" 9 #include "ui/aura/window_event_dispatcher.h"
10 #include "ui/aura/window_tree_host.h" 10 #include "ui/aura/window_tree_host.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 TEST_F(BubbleWindowTargeterTest, HitTest) { 90 TEST_F(BubbleWindowTargeterTest, HitTest) {
91 aura::Window* root = bubble_widget()->GetNativeWindow()->GetRootWindow(); 91 aura::Window* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
92 ui::EventTargeter* targeter = 92 ui::EventTargeter* targeter =
93 root->GetHost()->dispatcher()->GetDefaultEventTargeter(); 93 root->GetHost()->dispatcher()->GetDefaultEventTargeter();
94 aura::Window* bubble_window = bubble_widget()->GetNativeWindow(); 94 aura::Window* bubble_window = bubble_widget()->GetNativeWindow();
95 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow(); 95 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow();
96 96
97 { 97 {
98 bubble_delegate()->set_margins(gfx::Insets()); 98 bubble_delegate()->set_margins(gfx::Insets());
99 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 99 ui::MouseEvent move1(
100 bubble_bounds.origin(), ui::EventTimeForNow(), 100 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
101 ui::EF_NONE, ui::EF_NONE); 101 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
102 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
102 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); 103 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
103 } 104 }
104 { 105 {
105 bubble_delegate()->set_margins(gfx::Insets(20)); 106 bubble_delegate()->set_margins(gfx::Insets(20));
106 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 107 ui::MouseEvent move1(
107 bubble_bounds.origin(), ui::EventTimeForNow(), 108 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
108 ui::EF_NONE, ui::EF_NONE); 109 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
110 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
109 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); 111 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
110 } 112 }
111 113
112 bubble_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>( 114 bubble_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
113 new BubbleWindowTargeter(bubble_delegate()))); 115 new BubbleWindowTargeter(bubble_delegate())));
114 { 116 {
115 bubble_delegate()->set_margins(gfx::Insets(20)); 117 bubble_delegate()->set_margins(gfx::Insets(20));
116 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 118 ui::MouseEvent move1(
117 bubble_bounds.origin(), ui::EventTimeForNow(), 119 ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
118 ui::EF_NONE, ui::EF_NONE); 120 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
121 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
119 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); 122 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
120 } 123 }
121 } 124 }
122 125
123 } // namespace views 126 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698