summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/demo/demo_main.cc4
-rw-r--r--ui/aura/event_filter.cc9
-rw-r--r--ui/aura/event_filter.h6
-rw-r--r--ui/aura/event_filter_unittest.cc4
-rw-r--r--ui/aura/gestures/gesture_recognizer_unittest.cc4
-rw-r--r--ui/aura/root_window.cc14
-rw-r--r--ui/aura/root_window.h4
-rw-r--r--ui/aura/root_window_unittest.cc8
-rw-r--r--ui/aura/shared/compound_event_filter.cc8
-rw-r--r--ui/aura/shared/compound_event_filter.h2
-rw-r--r--ui/aura/shared/compound_event_filter_unittest.cc4
-rw-r--r--ui/aura/shared/input_method_event_filter.cc4
-rw-r--r--ui/aura/shared/input_method_event_filter.h2
-rw-r--r--ui/aura/test/test_event_filter.cc4
-rw-r--r--ui/aura/test/test_event_filter.h2
-rw-r--r--ui/aura/test/test_window_delegate.cc4
-rw-r--r--ui/aura/test/test_window_delegate.h2
-rw-r--r--ui/aura/window_delegate.cc3
-rw-r--r--ui/aura/window_delegate.h2
-rw-r--r--ui/aura/window_unittest.cc8
20 files changed, 47 insertions, 51 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 0571759..e0112d1 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -62,9 +62,9 @@ class DemoWindowDelegate : public aura::WindowDelegate {
virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
return ui::TOUCH_STATUS_END;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual bool CanFocus() OVERRIDE { return true; }
virtual void OnCaptureLost() OVERRIDE {}
diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc
index 1a6fbac..9f2c357 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -21,9 +21,9 @@ ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target,
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus EventFilter::PreHandleGestureEvent(Window* target,
- ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
+ ui::GestureEvent* event) {
+ return ui::ER_UNHANDLED;
}
ui::EventResult EventFilter::OnKeyEvent(ui::EventTarget* target,
@@ -50,8 +50,7 @@ ui::TouchStatus EventFilter::OnTouchEvent(ui::EventTarget* target,
ui::EventResult EventFilter::OnGestureEvent(ui::EventTarget* target,
ui::GestureEvent* event) {
- return PreHandleGestureEvent(static_cast<Window*>(target), event) ==
- ui::GESTURE_STATUS_CONSUMED ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
+ return PreHandleGestureEvent(static_cast<Window*>(target), event);
}
} // namespace aura
diff --git a/ui/aura/event_filter.h b/ui/aura/event_filter.h
index b782905..8ff0923 100644
--- a/ui/aura/event_filter.h
+++ b/ui/aura/event_filter.h
@@ -57,10 +57,10 @@ class AURA_EXPORT EventFilter : public ui::EventHandler {
virtual ui::TouchStatus PreHandleTouchEvent(Window* target,
ui::TouchEvent* event);
- // Returns a value other than ui::GESTURE_STATUS_UNKNOWN if the gesture is
+ // Returns a value other than ui::ER_UNHANDLED if the gesture is
// consumed.
- virtual ui::GestureStatus PreHandleGestureEvent(Window* target,
- ui::GestureEvent* event);
+ virtual ui::EventResult PreHandleGestureEvent(Window* target,
+ ui::GestureEvent* event);
virtual ui::EventResult OnKeyEvent(ui::EventTarget* target,
ui::KeyEvent* event) OVERRIDE;
diff --git a/ui/aura/event_filter_unittest.cc b/ui/aura/event_filter_unittest.cc
index 935658d..d7d7103 100644
--- a/ui/aura/event_filter_unittest.cc
+++ b/ui/aura/event_filter_unittest.cc
@@ -70,10 +70,10 @@ class TestEventFilterWindowDelegate : public test::TestWindowDelegate {
// TODO(sadrul): !
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
// TODO(sadrul): !
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
private:
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index bf16f00..79d9536 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -132,7 +132,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
const gfx::Rect& bounding_box() const { return bounding_box_; }
int tap_count() const { return tap_count_; }
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* gesture) OVERRIDE {
bounding_box_ = gesture->details().bounding_box();
switch (gesture->type()) {
@@ -201,7 +201,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
default:
NOTREACHED();
}
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
private:
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index d667f0d..7d14d52 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -302,8 +302,8 @@ bool RootWindow::DispatchGestureEvent(ui::GestureEvent* event) {
if (target) {
event->ConvertLocationToTarget(static_cast<Window*>(this), target);
- ui::GestureStatus status = ProcessGestureEvent(target, event);
- return status != ui::GESTURE_STATUS_UNKNOWN;
+ ui::EventResult status = ProcessGestureEvent(target, event);
+ return status != ui::ER_UNHANDLED;
}
return false;
@@ -672,14 +672,12 @@ ui::TouchStatus RootWindow::ProcessTouchEvent(Window* target,
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus RootWindow::ProcessGestureEvent(Window* target,
- ui::GestureEvent* event) {
+ui::EventResult RootWindow::ProcessGestureEvent(Window* target,
+ ui::GestureEvent* event) {
if (!target)
target = this;
AutoReset<Window*> reset(&event_dispatch_target_, target);
- if (ProcessEvent(target, event) != ui::ER_UNHANDLED)
- return ui::GESTURE_STATUS_CONSUMED;
- return ui::GESTURE_STATUS_UNKNOWN;
+ return static_cast<ui::EventResult>(ProcessEvent(target, event));
}
bool RootWindow::ProcessGestures(ui::GestureRecognizer::Gestures* gestures) {
@@ -688,7 +686,7 @@ bool RootWindow::ProcessGestures(ui::GestureRecognizer::Gestures* gestures) {
bool handled = false;
for (unsigned int i = 0; i < gestures->size(); i++) {
ui::GestureEvent* gesture = gestures->get().at(i);
- if (DispatchGestureEvent(gesture) != ui::GESTURE_STATUS_UNKNOWN)
+ if (DispatchGestureEvent(gesture) != ui::ER_UNHANDLED)
handled = true;
}
return handled;
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index ed74a8c..4aca5ad 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -280,8 +280,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
bool ProcessMouseEvent(Window* target, ui::MouseEvent* event);
bool ProcessKeyEvent(Window* target, ui::KeyEvent* event);
ui::TouchStatus ProcessTouchEvent(Window* target, ui::TouchEvent* event);
- ui::GestureStatus ProcessGestureEvent(Window* target,
- ui::GestureEvent* event);
+ ui::EventResult ProcessGestureEvent(Window* target,
+ ui::GestureEvent* event);
bool ProcessGestures(ui::GestureRecognizer::Gestures* gestures);
// Called when a Window is attached or detached from the RootWindow.
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 00a1afe..cd8e52c 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -108,9 +108,9 @@ class EventCountFilter : public EventFilter {
num_touch_events_++;
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target, ui::GestureEvent* event) OVERRIDE {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
private:
@@ -460,11 +460,11 @@ class EventFilterRecorder : public EventFilter {
events_.push_back(event->type());
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE {
events_.push_back(event->type());
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
private:
diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc
index 9ace7c6..ca2343f 100644
--- a/ui/aura/shared/compound_event_filter.cc
+++ b/ui/aura/shared/compound_event_filter.cc
@@ -133,14 +133,14 @@ ui::TouchStatus CompoundEventFilter::PreHandleTouchEvent(
return status;
}
-ui::GestureStatus CompoundEventFilter::PreHandleGestureEvent(
+ui::EventResult CompoundEventFilter::PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) {
- ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
+ ui::EventResult status = ui::ER_UNHANDLED;
if (filters_.might_have_observers()) {
ObserverListBase<EventFilter>::Iterator it(filters_);
EventFilter* filter;
- while (status == ui::GESTURE_STATUS_UNKNOWN &&
+ while (status == ui::ER_UNHANDLED &&
(filter = it.GetNext()) != NULL) {
status = filter->PreHandleGestureEvent(target, event);
}
@@ -148,7 +148,7 @@ ui::GestureStatus CompoundEventFilter::PreHandleGestureEvent(
if (event->type() == ui::ET_GESTURE_BEGIN &&
event->details().touch_points() == 1 &&
- status != ui::GESTURE_STATUS_CONSUMED &&
+ status != ui::ER_CONSUMED &&
target->GetRootWindow() &&
GetActiveWindow(target) != target) {
target->GetFocusManager()->SetFocusedWindow(
diff --git a/ui/aura/shared/compound_event_filter.h b/ui/aura/shared/compound_event_filter.h
index 6707e29..7ae8e04 100644
--- a/ui/aura/shared/compound_event_filter.h
+++ b/ui/aura/shared/compound_event_filter.h
@@ -57,7 +57,7 @@ class AURA_EXPORT CompoundEventFilter : public EventFilter {
virtual ui::TouchStatus PreHandleTouchEvent(
Window* target,
ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE;
diff --git a/ui/aura/shared/compound_event_filter_unittest.cc b/ui/aura/shared/compound_event_filter_unittest.cc
index bc981ae..478ef2e 100644
--- a/ui/aura/shared/compound_event_filter_unittest.cc
+++ b/ui/aura/shared/compound_event_filter_unittest.cc
@@ -70,10 +70,10 @@ class ConsumeGestureEventFilter : public EventFilter {
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE {
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
DISALLOW_COPY_AND_ASSIGN(ConsumeGestureEventFilter);
diff --git a/ui/aura/shared/input_method_event_filter.cc b/ui/aura/shared/input_method_event_filter.cc
index 8b1dedc..9cefcaa 100644
--- a/ui/aura/shared/input_method_event_filter.cc
+++ b/ui/aura/shared/input_method_event_filter.cc
@@ -67,10 +67,10 @@ ui::TouchStatus InputMethodEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus InputMethodEventFilter::PreHandleGestureEvent(
+ui::EventResult InputMethodEventFilter::PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/aura/shared/input_method_event_filter.h b/ui/aura/shared/input_method_event_filter.h
index 95d847e..e8dfb5f 100644
--- a/ui/aura/shared/input_method_event_filter.h
+++ b/ui/aura/shared/input_method_event_filter.h
@@ -40,7 +40,7 @@ class AURA_EXPORT InputMethodEventFilter
virtual ui::TouchStatus PreHandleTouchEvent(
Window* target,
ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE;
diff --git a/ui/aura/test/test_event_filter.cc b/ui/aura/test/test_event_filter.cc
index b2ad6cc..ab5210d 100644
--- a/ui/aura/test/test_event_filter.cc
+++ b/ui/aura/test/test_event_filter.cc
@@ -44,11 +44,11 @@ ui::TouchStatus TestEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus TestEventFilter::PreHandleGestureEvent(
+ui::EventResult TestEventFilter::PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) {
// TODO(sadrul): !
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
} // namespace test
diff --git a/ui/aura/test/test_event_filter.h b/ui/aura/test/test_event_filter.h
index 4b4a439..fe02e9e 100644
--- a/ui/aura/test/test_event_filter.h
+++ b/ui/aura/test/test_event_filter.h
@@ -45,7 +45,7 @@ class TestEventFilter : public EventFilter {
virtual ui::TouchStatus PreHandleTouchEvent(
Window* target,
ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE;
diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc
index 807daea..20ab7bc 100644
--- a/ui/aura/test/test_window_delegate.cc
+++ b/ui/aura/test/test_window_delegate.cc
@@ -64,9 +64,9 @@ ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus TestWindowDelegate::OnGestureEvent(
+ui::EventResult TestWindowDelegate::OnGestureEvent(
ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
bool TestWindowDelegate::CanFocus() {
diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h
index e17311c..532ad13 100644
--- a/ui/aura/test/test_window_delegate.h
+++ b/ui/aura/test/test_window_delegate.h
@@ -39,7 +39,7 @@ class TestWindowDelegate : public WindowDelegate {
const gfx::Point& location) OVERRIDE;
virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE;
virtual bool CanFocus() OVERRIDE;
virtual void OnCaptureLost() OVERRIDE;
diff --git a/ui/aura/window_delegate.cc b/ui/aura/window_delegate.cc
index 62c0f7a..b5f7387 100644
--- a/ui/aura/window_delegate.cc
+++ b/ui/aura/window_delegate.cc
@@ -28,8 +28,7 @@ ui::TouchStatus WindowDelegate::OnTouchEvent(ui::EventTarget* target,
ui::EventResult WindowDelegate::OnGestureEvent(ui::EventTarget* target,
ui::GestureEvent* event) {
- return OnGestureEvent(event) == ui::GESTURE_STATUS_CONSUMED ?
- ui::ER_CONSUMED : ui::ER_UNHANDLED;
+ return OnGestureEvent(event);
}
} // namespace aura
diff --git a/ui/aura/window_delegate.h b/ui/aura/window_delegate.h
index 6f5aca9..d8abbfb 100644
--- a/ui/aura/window_delegate.h
+++ b/ui/aura/window_delegate.h
@@ -62,7 +62,7 @@ class AURA_EXPORT WindowDelegate : public ui::EventHandler {
virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) = 0;
- virtual ui::GestureStatus OnGestureEvent(ui::GestureEvent* event) = 0;
+ virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) = 0;
// Returns true of the window can be focused.
virtual bool CanFocus() = 0;
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 09be9ea..b48b723 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -175,10 +175,10 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate {
touch_event_count_++;
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
gesture_event_count_++;
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual void OnCaptureLost() OVERRIDE {
capture_lost_count_++;
@@ -218,10 +218,10 @@ class GestureTrackPositionDelegate : public TestWindowDelegate {
public:
GestureTrackPositionDelegate() {}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
position_ = event->location();
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
const gfx::Point& position() const { return position_; }
generated by cgit v1.1 at 2025-02-11 10:49:49 +0000