summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/views/view.cc6
-rw-r--r--ui/views/view.h13
-rw-r--r--ui/views/view_targeter_unittest.cc18
-rw-r--r--ui/views/widget/root_view.cc2
-rw-r--r--ui/views/widget/root_view_unittest.cc3
5 files changed, 23 insertions, 19 deletions
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 15c78de..c40b0ca 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1101,9 +1101,9 @@ const InputMethod* View::GetInputMethod() const {
return widget ? widget->GetInputMethod() : NULL;
}
-scoped_ptr<ui::EventTargeter>
-View::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {
- scoped_ptr<ui::EventTargeter> old_targeter = targeter_.Pass();
+scoped_ptr<ViewTargeter>
+View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
+ scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass();
targeter_ = targeter.Pass();
return old_targeter.Pass();
}
diff --git a/ui/views/view.h b/ui/views/view.h
index 1177913..fea8040 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -26,13 +26,13 @@
#include "ui/compositor/layer_owner.h"
#include "ui/events/event.h"
#include "ui/events/event_target.h"
-#include "ui/events/event_targeter.h"
#include "ui/gfx/geometry/r_tree.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/vector2d.h"
#include "ui/views/cull_set.h"
+#include "ui/views/view_targeter.h"
#include "ui/views/views_export.h"
#if defined(OS_WIN)
@@ -719,10 +719,9 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
virtual InputMethod* GetInputMethod();
virtual const InputMethod* GetInputMethod() const;
- // Sets a new event-targeter for the view, and returns the previous
- // event-targeter.
- scoped_ptr<ui::EventTargeter> SetEventTargeter(
- scoped_ptr<ui::EventTargeter> targeter);
+ // Sets a new ViewTargeter for the view, and returns the previous
+ // ViewTargeter.
+ scoped_ptr<ViewTargeter> SetEventTargeter(scoped_ptr<ViewTargeter> targeter);
// Overridden from ui::EventTarget:
virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
@@ -732,6 +731,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
virtual void ConvertEventToTarget(ui::EventTarget* target,
ui::LocatedEvent* event) OVERRIDE;
+ ViewTargeter* targeter() const { return targeter_.get(); }
+
// Overridden from ui::EventHandler:
virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
@@ -1604,7 +1605,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
// Input --------------------------------------------------------------------
- scoped_ptr<ui::EventTargeter> targeter_;
+ scoped_ptr<ViewTargeter> targeter_;
// Accessibility -------------------------------------------------------------
diff --git a/ui/views/view_targeter_unittest.cc b/ui/views/view_targeter_unittest.cc
index 8fd4eba..7b9b194 100644
--- a/ui/views/view_targeter_unittest.cc
+++ b/ui/views/view_targeter_unittest.cc
@@ -7,6 +7,7 @@
#include "ui/events/event_targeter.h"
#include "ui/events/event_utils.h"
#include "ui/views/test/views_test_base.h"
+#include "ui/views/view_targeter.h"
#include "ui/views/widget/root_view.h"
namespace views {
@@ -61,10 +62,11 @@ TEST_F(ViewTargeterTest, ViewTargeterForKeyEvents) {
grandchild->SetFocusable(true);
grandchild->RequestFocus();
- ui::EventTargeter* targeter = new ViewTargeter();
+ ViewTargeter* view_targeter = new ViewTargeter();
+ ui::EventTargeter* targeter = view_targeter;
internal::RootView* root_view =
static_cast<internal::RootView*>(widget.GetRootView());
- root_view->SetEventTargeter(make_scoped_ptr(targeter));
+ root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, true);
@@ -109,10 +111,11 @@ TEST_F(ViewTargeterTest, ViewTargeterForScrollEvents) {
content->AddChildView(child);
child->AddChildView(grandchild);
- ui::EventTargeter* targeter = new ViewTargeter();
+ ViewTargeter* view_targeter = new ViewTargeter();
+ ui::EventTargeter* targeter = view_targeter;
internal::RootView* root_view =
static_cast<internal::RootView*>(widget.GetRootView());
- root_view->SetEventTargeter(make_scoped_ptr(targeter));
+ root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
// The event falls within the bounds of |child| and |content| but not
// |grandchild|, so |child| should be the initial target for the event.
@@ -161,7 +164,7 @@ TEST_F(ViewTargeterTest, SubtreeShouldBeExploredForEvent) {
params.bounds = gfx::Rect(0, 0, 650, 650);
widget.Init(params);
- ui::EventTargeter* targeter = new ViewTargeter();
+ ViewTargeter* targeter = new ViewTargeter();
internal::RootView* root_view =
static_cast<internal::RootView*>(widget.GetRootView());
root_view->SetEventTargeter(make_scoped_ptr(targeter));
@@ -226,10 +229,11 @@ TEST_F(ViewTargeterTest, CanProcessEventsWithinSubtree) {
params.bounds = gfx::Rect(0, 0, 650, 650);
widget.Init(params);
- ui::EventTargeter* targeter = new ViewTargeter();
+ ViewTargeter* view_targeter = new ViewTargeter();
+ ui::EventTargeter* targeter = view_targeter;
internal::RootView* root_view =
static_cast<internal::RootView*>(widget.GetRootView());
- root_view->SetEventTargeter(make_scoped_ptr(targeter));
+ root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
// The coordinates used for SetBounds() are in the parent coordinate space.
TestingView v1, v2, v3;
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index b41e16c..f83abee 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -169,7 +169,7 @@ RootView::RootView(Widget* widget)
old_dispatch_target_(NULL) {
AddPreTargetHandler(pre_dispatch_handler_.get());
AddPostTargetHandler(post_dispatch_handler_.get());
- SetEventTargeter(scoped_ptr<ui::EventTargeter>(new ViewTargeter()));
+ SetEventTargeter(scoped_ptr<ViewTargeter>(new ViewTargeter()));
}
RootView::~RootView() {
diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc
index 9def772..3ffc976 100644
--- a/ui/views/widget/root_view_unittest.cc
+++ b/ui/views/widget/root_view_unittest.cc
@@ -4,7 +4,6 @@
#include "ui/views/widget/root_view.h"
-#include "ui/events/event_targeter.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/test/views_test_base.h"
#include "ui/views/view_targeter.h"
@@ -54,7 +53,7 @@ TEST_F(RootViewTest, DeleteViewDuringKeyEventDispatch) {
child->SetFocusable(true);
child->RequestFocus();
- ui::EventTargeter* targeter = new ViewTargeter();
+ ViewTargeter* targeter = new ViewTargeter();
internal::RootView* root_view =
static_cast<internal::RootView*>(widget.GetRootView());
root_view->SetEventTargeter(make_scoped_ptr(targeter));
generated by cgit v1.1 at 2024-10-27 14:34:40 +0000