summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_filter.cc8
-rw-r--r--ash/accelerators/accelerator_filter.h5
-rw-r--r--ash/app_list/app_list.cc6
-rw-r--r--ash/app_list/app_list.h3
-rw-r--r--ash/drag_drop/drag_drop_controller.cc6
-rw-r--r--ash/drag_drop/drag_drop_controller.h3
-rw-r--r--ash/ime/input_method_event_filter.cc8
-rw-r--r--ash/ime/input_method_event_filter.h5
-rw-r--r--ash/tooltips/tooltip_controller.cc6
-rw-r--r--ash/tooltips/tooltip_controller.h2
-rw-r--r--ash/wm/modality_event_filter.cc9
-rw-r--r--ash/wm/modality_event_filter.h5
-rw-r--r--ash/wm/root_window_event_filter.cc9
-rw-r--r--ash/wm/root_window_event_filter.h5
-rw-r--r--ash/wm/toplevel_window_event_filter.cc7
-rw-r--r--ash/wm/toplevel_window_event_filter.h3
-rw-r--r--ash/wm/window_cycle_controller.cc9
-rw-r--r--ash/wm/window_modality_controller.cc7
-rw-r--r--ash/wm/window_modality_controller.h3
19 files changed, 101 insertions, 8 deletions
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index f2e4b6e..35cadd0 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -54,5 +54,11 @@ ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus AcceleratorFilter::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
} // namespace internal
} // namespace ash
diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
index 56ebfb1..8e6883b 100644
--- a/ash/accelerators/accelerator_filter.h
+++ b/ash/accelerators/accelerator_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -28,6 +28,9 @@ class ASH_EXPORT AcceleratorFilter : public aura::EventFilter {
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc
index 9f2ce91..8510d09 100644
--- a/ash/app_list/app_list.cc
+++ b/ash/app_list/app_list.cc
@@ -149,6 +149,12 @@ ui::TouchStatus AppList::PreHandleTouchEvent(aura::Window* target,
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus AppList::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
////////////////////////////////////////////////////////////////////////////////
// AppList, ui::LayerAnimationObserver implementation:
diff --git a/ash/app_list/app_list.h b/ash/app_list/app_list.h
index 2dfd0c9..77b2ecd 100644
--- a/ash/app_list/app_list.h
+++ b/ash/app_list/app_list.h
@@ -50,6 +50,9 @@ class AppList : public aura::EventFilter,
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
// ui::LayerAnimationObserver overrides:
virtual void OnLayerAnimationEnded(
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index c983a43..a0c1ac57 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -180,6 +180,12 @@ ui::TouchStatus DragDropController::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus DragDropController::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
////////////////////////////////////////////////////////////////////////////////
// DragDropController, private:
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index cbe6853..0f9b257 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -62,6 +62,9 @@ class ASH_EXPORT DragDropController
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
friend class ash::test::DragDropControllerTest;
diff --git a/ash/ime/input_method_event_filter.cc b/ash/ime/input_method_event_filter.cc
index 7f802c0..d9cdf42 100644
--- a/ash/ime/input_method_event_filter.cc
+++ b/ash/ime/input_method_event_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -62,6 +62,12 @@ ui::TouchStatus InputMethodEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus InputMethodEventFilter::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
////////////////////////////////////////////////////////////////////////////////
// InputMethodEventFilter, ui::InputMethodDelegate implementation:
diff --git a/ash/ime/input_method_event_filter.h b/ash/ime/input_method_event_filter.h
index dcafe67..cfea0d6 100644
--- a/ash/ime/input_method_event_filter.h
+++ b/ash/ime/input_method_event_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -38,6 +38,9 @@ class ASH_EXPORT InputMethodEventFilter
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
// Overridden from ui::internal::InputMethodDelegate.
virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE;
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 9c77d2d..f6cd200 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -270,6 +270,12 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus TooltipController::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
void TooltipController::OnWindowDestroyed(aura::Window* window) {
if (tooltip_window_ == window) {
tooltip_window_->RemoveObserver(this);
diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
index 2246ad5..2e38895 100644
--- a/ash/tooltips/tooltip_controller.h
+++ b/ash/tooltips/tooltip_controller.h
@@ -48,6 +48,8 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
// Overridden from aura::WindowObserver.
virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
diff --git a/ash/wm/modality_event_filter.cc b/ash/wm/modality_event_filter.cc
index 1b8128d..16fba18 100644
--- a/ash/wm/modality_event_filter.cc
+++ b/ash/wm/modality_event_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -36,5 +36,12 @@ ui::TouchStatus ModalityEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus ModalityEventFilter::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ // TODO(sad):
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
} // namespace internal
} // namespace ash
diff --git a/ash/wm/modality_event_filter.h b/ash/wm/modality_event_filter.h
index 0005f382..5063525 100644
--- a/ash/wm/modality_event_filter.h
+++ b/ash/wm/modality_event_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -29,6 +29,9 @@ class ASH_EXPORT ModalityEventFilter : public aura::EventFilter {
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
ModalityEventFilterDelegate* delegate_;
diff --git a/ash/wm/root_window_event_filter.cc b/ash/wm/root_window_event_filter.cc
index 7ed9ed8..564033f 100644
--- a/ash/wm/root_window_event_filter.cc
+++ b/ash/wm/root_window_event_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -109,6 +109,13 @@ ui::TouchStatus RootWindowEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus RootWindowEventFilter::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ // TODO(sad):
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
////////////////////////////////////////////////////////////////////////////////
// RootWindowEventFilter, private:
diff --git a/ash/wm/root_window_event_filter.h b/ash/wm/root_window_event_filter.h
index 56b2d85..0eb552c 100644
--- a/ash/wm/root_window_event_filter.h
+++ b/ash/wm/root_window_event_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -40,6 +40,9 @@ class ASH_EXPORT RootWindowEventFilter : public aura::EventFilter {
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
// Updates the cursor if the target provides a custom one, and provides
diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc
index 44c0e68..ccc7a4e 100644
--- a/ash/wm/toplevel_window_event_filter.cc
+++ b/ash/wm/toplevel_window_event_filter.cc
@@ -223,6 +223,13 @@ ui::TouchStatus ToplevelWindowEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus ToplevelWindowEventFilter::PreHandleGestureEvent(
+ aura::Window* target, aura::GestureEvent* event) {
+ // TODO(sad): Process gestures as appropriate (e.g. switch between windows,
+ // close window etc.)
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
void ToplevelWindowEventFilter::RunMoveLoop(aura::Window* source) {
DCHECK(!in_move_loop_); // Can only handle one nested loop at a time.
in_move_loop_ = true;
diff --git a/ash/wm/toplevel_window_event_filter.h b/ash/wm/toplevel_window_event_filter.h
index a08e973..2b5c88e 100644
--- a/ash/wm/toplevel_window_event_filter.h
+++ b/ash/wm/toplevel_window_event_filter.h
@@ -38,6 +38,9 @@ class ASH_EXPORT ToplevelWindowEventFilter :
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
// Overridden form aura::client::WindowMoveClient:
virtual void RunMoveLoop(aura::Window* source) OVERRIDE;
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc
index 7a578ed..529ff27 100644
--- a/ash/wm/window_cycle_controller.cc
+++ b/ash/wm/window_cycle_controller.cc
@@ -27,6 +27,9 @@ class WindowCycleEventFilter : public aura::EventFilter {
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(WindowCycleEventFilter);
};
@@ -63,6 +66,12 @@ ui::TouchStatus WindowCycleEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
}
+ui::GestureStatus WindowCycleEventFilter::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
+}
+
//////////////////////////////////////////////////////////////////////////////
// WindowCycleController, public:
diff --git a/ash/wm/window_modality_controller.cc b/ash/wm/window_modality_controller.cc
index 86e4c02..a4aadc3 100644
--- a/ash/wm/window_modality_controller.cc
+++ b/ash/wm/window_modality_controller.cc
@@ -72,5 +72,12 @@ ui::TouchStatus WindowModalityController::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
+ui::GestureStatus WindowModalityController::PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) {
+ // TODO: make gestures work with modals.
+ return ui::GESTURE_STATUS_UNKNOWN;
+}
+
} // namespace internal
} // namespace ash
diff --git a/ash/wm/window_modality_controller.h b/ash/wm/window_modality_controller.h
index 0b43965..0251a77 100644
--- a/ash/wm/window_modality_controller.h
+++ b/ash/wm/window_modality_controller.h
@@ -31,6 +31,9 @@ class WindowModalityController : public aura::EventFilter {
aura::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
aura::TouchEvent* event) OVERRIDE;
+ virtual ui::GestureStatus PreHandleGestureEvent(
+ aura::Window* target,
+ aura::GestureEvent* event) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(WindowModalityController);
generated by cgit v1.1 at 2025-02-15 01:30:01 +0000