| 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 "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/events/event_utils.h" | 10 #include "ui/events/event_utils.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 anchor_->Init(params); | 72 anchor_->Init(params); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void CreateBubbleWidget() { | 75 void CreateBubbleWidget() { |
| 76 bubble_delegate_ = new WidgetOwnsNativeBubble( | 76 bubble_delegate_ = new WidgetOwnsNativeBubble( |
| 77 anchor_->GetContentsView(), BubbleBorder::NONE); | 77 anchor_->GetContentsView(), BubbleBorder::NONE); |
| 78 bubble_delegate_->set_color(SK_ColorGREEN); | 78 bubble_delegate_->set_color(SK_ColorGREEN); |
| 79 bubble_widget_.reset(BubbleDelegateView::CreateBubble(bubble_delegate_)); | 79 bubble_widget_.reset(BubbleDelegateView::CreateBubble(bubble_delegate_)); |
| 80 } | 80 } |
| 81 | 81 |
| 82 scoped_ptr<Widget> anchor_; | 82 std::unique_ptr<Widget> anchor_; |
| 83 scoped_ptr<Widget> bubble_widget_; | 83 std::unique_ptr<Widget> bubble_widget_; |
| 84 BubbleDelegateView* bubble_delegate_; | 84 BubbleDelegateView* bubble_delegate_; |
| 85 | 85 |
| 86 DISALLOW_COPY_AND_ASSIGN(BubbleWindowTargeterTest); | 86 DISALLOW_COPY_AND_ASSIGN(BubbleWindowTargeterTest); |
| 87 }; | 87 }; |
| 88 | 88 |
| 89 TEST_F(BubbleWindowTargeterTest, HitTest) { | 89 TEST_F(BubbleWindowTargeterTest, HitTest) { |
| 90 ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow(); | 90 ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow(); |
| 91 ui::EventTargeter* targeter = root->GetEventTargeter(); | 91 ui::EventTargeter* targeter = root->GetEventTargeter(); |
| 92 aura::Window* bubble_window = bubble_widget()->GetNativeWindow(); | 92 aura::Window* bubble_window = bubble_widget()->GetNativeWindow(); |
| 93 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow(); | 93 gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow(); |
| 94 | 94 |
| 95 { | 95 { |
| 96 bubble_delegate()->set_margins(gfx::Insets()); | 96 bubble_delegate()->set_margins(gfx::Insets()); |
| 97 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 97 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), |
| 98 bubble_bounds.origin(), ui::EventTimeForNow(), | 98 bubble_bounds.origin(), ui::EventTimeForNow(), |
| 99 ui::EF_NONE, ui::EF_NONE); | 99 ui::EF_NONE, ui::EF_NONE); |
| 100 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 100 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
| 101 } | 101 } |
| 102 { | 102 { |
| 103 bubble_delegate()->set_margins(gfx::Insets(20)); | 103 bubble_delegate()->set_margins(gfx::Insets(20)); |
| 104 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 104 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), |
| 105 bubble_bounds.origin(), ui::EventTimeForNow(), | 105 bubble_bounds.origin(), ui::EventTimeForNow(), |
| 106 ui::EF_NONE, ui::EF_NONE); | 106 ui::EF_NONE, ui::EF_NONE); |
| 107 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 107 EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
| 108 } | 108 } |
| 109 | 109 |
| 110 bubble_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( | 110 bubble_window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>( |
| 111 new BubbleWindowTargeter(bubble_delegate()))); | 111 new BubbleWindowTargeter(bubble_delegate()))); |
| 112 { | 112 { |
| 113 bubble_delegate()->set_margins(gfx::Insets(20)); | 113 bubble_delegate()->set_margins(gfx::Insets(20)); |
| 114 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), | 114 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), |
| 115 bubble_bounds.origin(), ui::EventTimeForNow(), | 115 bubble_bounds.origin(), ui::EventTimeForNow(), |
| 116 ui::EF_NONE, ui::EF_NONE); | 116 ui::EF_NONE, ui::EF_NONE); |
| 117 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); | 117 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); |
| 118 } | 118 } |
| 119 } | 119 } |
| 120 | 120 |
| 121 } // namespace views | 121 } // namespace views |
| OLD | NEW |