Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / system_gesture_event_filter.cc

diff --git a/src/ash/wm/system_gesture_event_filter.cc b/src/ash/wm/system_gesture_event_filter.cc
index d23325d..0a1d145 100644 (file)
--- a/src/ash/wm/system_gesture_event_filter.cc
+++ b/src/ash/wm/system_gesture_event_filter.cc
@@ -4,58 +4,33 @@
 
 #include "ash/wm/system_gesture_event_filter.h"
 
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
-#include "ash/root_window_controller.h"
 #include "ash/shell.h"
-#include "ash/shell_window_ids.h"
+#include "ash/touch/touch_uma.h"
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 #include "ash/wm/gestures/overview_gesture_handler.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
-#include "ash/wm/gestures/system_pinch_handler.h"
-#include "ash/wm/window_util.h"
-#include "base/command_line.h"
-#include "ui/aura/root_window.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
-#if defined(OS_CHROMEOS)
-#include "ui/events/x/touch_factory_x11.h"
+#if defined(OS_CHROMEOS) && defined(USE_X11)
+#include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
 
-namespace {
-
-aura::Window* GetTargetForSystemGestureEvent(aura::Window* target) {
-  aura::Window* system_target = target;
-  if (!system_target || system_target == target->GetRootWindow())
-    system_target = ash::wm::GetActiveWindow();
-  if (system_target)
-    system_target = system_target->GetToplevelWindow();
-  return system_target;
-}
-
-}  // namespace
-
 namespace ash {
-namespace internal {
 
 SystemGestureEventFilter::SystemGestureEventFilter()
-    : system_gestures_enabled_(CommandLine::ForCurrentProcess()->
-          HasSwitch(ash::switches::kAshEnableAdvancedGestures)),
-      long_press_affordance_(new LongPressAffordanceHandler),
+    : long_press_affordance_(new LongPressAffordanceHandler),
+      overview_gesture_handler_(new OverviewGestureHandler),
       shelf_gesture_handler_(new ShelfGestureHandler()) {
-  if (switches::UseOverviewMode())
-    overview_gesture_handler_.reset(new OverviewGestureHandler);
 }
 
 SystemGestureEventFilter::~SystemGestureEventFilter() {
 }
 
 void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) {
-#if defined(OS_CHROMEOS) && !defined(USE_OZONE)
+#if defined(OS_CHROMEOS) && defined(USE_X11)
   if (event->type() == ui::ET_MOUSE_PRESSED && event->native_event() &&
       ui::TouchFactory::GetInstance()->IsTouchDevicePresent() &&
       Shell::GetInstance()->delegate()) {
@@ -68,7 +43,6 @@ void SystemGestureEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
   if (overview_gesture_handler_ &&
       overview_gesture_handler_->ProcessScrollEvent(*event)) {
     event->StopPropagation();
-    return;
   }
 }
 
@@ -90,74 +64,10 @@ void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) {
 
   if (event->type() == ui::ET_GESTURE_WIN8_EDGE_SWIPE &&
       shelf_gesture_handler_->ProcessGestureEvent(*event)) {
-    event->StopPropagation();
+    // Do not stop propagation, since the immersive fullscreen controller may
+    // need to handle this event.
     return;
   }
-
-  if (!system_gestures_enabled_)
-    return;
-
-  aura::Window* system_target = GetTargetForSystemGestureEvent(target);
-  if (!system_target)
-    return;
-
-  RootWindowController* root_controller =
-      GetRootWindowController(system_target->GetRootWindow());
-  CHECK(root_controller);
-  aura::Window* desktop_container = root_controller->GetContainer(
-      ash::internal::kShellWindowId_DesktopBackgroundContainer);
-  if (desktop_container->Contains(system_target)) {
-    // The gesture was on the desktop window.
-    if (event->type() == ui::ET_GESTURE_MULTIFINGER_SWIPE &&
-        event->details().swipe_up() &&
-        event->details().touch_points() ==
-        SystemPinchHandler::kSystemGesturePoints) {
-      ash::AcceleratorController* accelerator =
-          ash::Shell::GetInstance()->accelerator_controller();
-      if (accelerator->PerformAction(CYCLE_FORWARD_MRU, ui::Accelerator()))
-        event->StopPropagation();
-    }
-    return;
-  }
-
-  WindowPinchHandlerMap::iterator find = pinch_handlers_.find(system_target);
-  if (find != pinch_handlers_.end()) {
-    SystemGestureStatus status =
-        (*find).second->ProcessGestureEvent(*event);
-    if (status == SYSTEM_GESTURE_END)
-      ClearGestureHandlerForWindow(system_target);
-    event->StopPropagation();
-  } else {
-    if (event->type() == ui::ET_GESTURE_BEGIN &&
-        event->details().touch_points() >=
-        SystemPinchHandler::kSystemGesturePoints) {
-      pinch_handlers_[system_target] = new SystemPinchHandler(system_target);
-      system_target->AddObserver(this);
-      event->StopPropagation();
-    }
-  }
-}
-
-void SystemGestureEventFilter::OnWindowVisibilityChanged(aura::Window* window,
-                                                         bool visible) {
-  if (!visible)
-    ClearGestureHandlerForWindow(window);
 }
 
-void SystemGestureEventFilter::OnWindowDestroying(aura::Window* window) {
-  ClearGestureHandlerForWindow(window);
-}
-
-void SystemGestureEventFilter::ClearGestureHandlerForWindow(
-    aura::Window* window) {
-  WindowPinchHandlerMap::iterator find = pinch_handlers_.find(window);
-  if (find == pinch_handlers_.end()) {
-    // The handler may have already been removed.
-    return;
-  }
-  delete (*find).second;
-  pinch_handlers_.erase(find);
-  window->RemoveObserver(this);
-}
-}  // namespace internal
 }  // namespace ash