| 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/view_targeter.h" | 5 #include "ui/views/view_targeter.h" |
| 6 | 6 |
| 7 #include "ui/events/event_targeter.h" | 7 #include "ui/events/event_targeter.h" |
| 8 #include "ui/events/event_utils.h" | 8 #include "ui/events/event_utils.h" |
| 9 #include "ui/gfx/path.h" | 9 #include "ui/gfx/path.h" |
| 10 #include "ui/views/masked_targeter_delegate.h" | 10 #include "ui/views/masked_targeter_delegate.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 grandchild->SetFocusable(true); | 115 grandchild->SetFocusable(true); |
| 116 grandchild->RequestFocus(); | 116 grandchild->RequestFocus(); |
| 117 | 117 |
| 118 internal::RootView* root_view = | 118 internal::RootView* root_view = |
| 119 static_cast<internal::RootView*>(widget.GetRootView()); | 119 static_cast<internal::RootView*>(widget.GetRootView()); |
| 120 ViewTargeter* view_targeter = new ViewTargeter(root_view); | 120 ViewTargeter* view_targeter = new ViewTargeter(root_view); |
| 121 ui::EventTargeter* targeter = view_targeter; | 121 ui::EventTargeter* targeter = view_targeter; |
| 122 root_view->SetEventTargeter(make_scoped_ptr(view_targeter)); | 122 root_view->SetEventTargeter(make_scoped_ptr(view_targeter)); |
| 123 | 123 |
| 124 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, true); | 124 ui::KeyEvent key_event('a', ui::VKEY_A, ui::EF_NONE); |
| 125 | 125 |
| 126 // The focused view should be the initial target of the event. | 126 // The focused view should be the initial target of the event. |
| 127 ui::EventTarget* current_target = targeter->FindTargetForEvent(root_view, | 127 ui::EventTarget* current_target = targeter->FindTargetForEvent(root_view, |
| 128 &key_event); | 128 &key_event); |
| 129 EXPECT_EQ(grandchild, static_cast<View*>(current_target)); | 129 EXPECT_EQ(grandchild, static_cast<View*>(current_target)); |
| 130 | 130 |
| 131 // Verify that FindNextBestTarget() will return the parent view of the | 131 // Verify that FindNextBestTarget() will return the parent view of the |
| 132 // argument (and NULL if the argument has no parent view). | 132 // argument (and NULL if the argument has no parent view). |
| 133 current_target = targeter->FindNextBestTarget(grandchild, &key_event); | 133 current_target = targeter->FindNextBestTarget(grandchild, &key_event); |
| 134 EXPECT_EQ(child, static_cast<View*>(current_target)); | 134 EXPECT_EQ(child, static_cast<View*>(current_target)); |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 EXPECT_EQ(v1, root_view->GetTooltipHandlerForPoint(v1_origin)); | 471 EXPECT_EQ(v1, root_view->GetTooltipHandlerForPoint(v1_origin)); |
| 472 EXPECT_EQ(root_view, root_view->GetTooltipHandlerForPoint(v2_origin)); | 472 EXPECT_EQ(root_view, root_view->GetTooltipHandlerForPoint(v2_origin)); |
| 473 | 473 |
| 474 EXPECT_FALSE(v1->GetTooltipHandlerForPoint(v2_origin)); | 474 EXPECT_FALSE(v1->GetTooltipHandlerForPoint(v2_origin)); |
| 475 | 475 |
| 476 widget->CloseNow(); | 476 widget->CloseNow(); |
| 477 } | 477 } |
| 478 | 478 |
| 479 } // namespace test | 479 } // namespace test |
| 480 } // namespace views | 480 } // namespace views |
| OLD | NEW |