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

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

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 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
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 "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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 scoped_ptr<Widget> bubble_widget_; 82 scoped_ptr<Widget> bubble_widget_;
83 BubbleDelegateView* bubble_delegate_; 83 BubbleDelegateView* bubble_delegate_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(BubbleWindowTargeterTest); 85 DISALLOW_COPY_AND_ASSIGN(BubbleWindowTargeterTest);
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 auto bubble_bounds = gfx::RectF(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(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
97 bubble_bounds.origin(), ui::EventTimeForNow(), 97 bubble_bounds.origin(), ui::EventTimeForNow(),
98 ui::EF_NONE, ui::EF_NONE); 98 ui::EF_NONE, ui::EF_NONE);
99 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); 99 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
100 } 100 }
101 { 101 {
102 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); 102 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
103 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 103 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
104 bubble_bounds.origin(), ui::EventTimeForNow(), 104 bubble_bounds.origin(), ui::EventTimeForNow(),
105 ui::EF_NONE, ui::EF_NONE); 105 ui::EF_NONE, ui::EF_NONE);
106 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); 106 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
107 } 107 }
108 108
109 bubble_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( 109 bubble_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
110 new BubbleWindowTargeter(bubble_delegate()))); 110 new BubbleWindowTargeter(bubble_delegate())));
111 { 111 {
112 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); 112 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
113 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 113 ui::MouseEvent move1(ui::ET_MOUSE_MOVED,
114 bubble_bounds.origin(), ui::EventTimeForNow(), 114 gfx::PointF(bubble_bounds.origin()),
115 ui::EF_NONE, ui::EF_NONE); 115 gfx::PointF(bubble_bounds.origin()),
116 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
116 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); 117 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
117 } 118 }
118 } 119 }
119 120
120 } // namespace views 121 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698