Revert of Cros Tablet Window management - Split Screen part II

ash/wm/overview/scoped_transform_overview_window.cc

 // Copyright 2013 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.
 
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
 #include "ash/wm/overview/window_selector_item.h"
-#include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/window_mirror_view.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
@@ skipping 135 matching lines @@
 
 TransientDescendantIteratorRange GetTransientTreeIterator(
     aura::Window* window) {
   return TransientDescendantIteratorRange(
       TransientDescendantIterator(GetTransientRoot(window)));
 }
 
 }  // namespace
 
 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow(
-    WindowSelectorItem* selector_item,
     aura::Window* window)
-    : selector_item_(selector_item),
-      window_(window),
+    : window_(window),
       determined_original_window_shape_(false),
       ignored_by_shelf_(wm::GetWindowState(window)->ignored_by_shelf()),
       overview_started_(false),
       original_transform_(window->layer()->GetTargetTransform()),
       original_opacity_(window->layer()->GetTargetOpacity()),
       weak_ptr_factory_(this) {}
 
 ScopedTransformOverviewWindow::~ScopedTransformOverviewWindow() {}
 
 void ScopedTransformOverviewWindow::RestoreWindow() {
@@ skipping 270 matching lines @@
   if (minimized_widget_)
     return GetOverviewWindowForMinimizedState();
   return window_;
 }
 
 void ScopedTransformOverviewWindow::EnsureVisible() {
   original_opacity_ = 1.f;
 }
 
 void ScopedTransformOverviewWindow::OnGestureEvent(ui::GestureEvent* event) {
-  if (minimized_widget_ && SplitViewController::ShouldAllowSplitView()) {
-    gfx::Point location(event->location());
-    ::wm::ConvertPointToScreen(minimized_widget_->GetNativeWindow(), &location);
-    switch (event->type()) {
-      case ui::ET_GESTURE_SCROLL_BEGIN:
-      case ui::ET_GESTURE_TAP_DOWN:
-        selector_item_->HandlePressEvent(location);
-        break;
-      case ui::ET_GESTURE_SCROLL_UPDATE:
-        selector_item_->HandleDragEvent(location);
-        break;
-      case ui::ET_GESTURE_END:
-        selector_item_->HandleReleaseEvent(location);
-        break;
-      default:
-        break;
-    }
-    event->SetHandled();
-  } else if (event->type() == ui::ET_GESTURE_TAP) {
+  if (event->type() == ui::ET_GESTURE_TAP) {
     EnsureVisible();
     window_->Show();
     wm::ActivateWindow(window_);
   }
 }
 
 void ScopedTransformOverviewWindow::OnMouseEvent(ui::MouseEvent* event) {
-  if (minimized_widget_ && SplitViewController::ShouldAllowSplitView()) {
-    gfx::Point location(event->location());
-    ::wm::ConvertPointToScreen(minimized_widget_->GetNativeWindow(), &location);
-    switch (event->type()) {
-      case ui::ET_MOUSE_PRESSED:
-        selector_item_->HandlePressEvent(location);
-        break;
-      case ui::ET_MOUSE_DRAGGED:
-        selector_item_->HandleDragEvent(location);
-        break;
-      case ui::ET_MOUSE_RELEASED:
-        selector_item_->HandleReleaseEvent(location);
-        break;
-      default:
-        break;
-    }
-    event->SetHandled();
-  } else if (event->type() == ui::ET_MOUSE_PRESSED &&
-             event->IsOnlyLeftMouseButton()) {
+  if (event->type() == ui::ET_MOUSE_PRESSED && event->IsOnlyLeftMouseButton()) {
     EnsureVisible();
     window_->Show();
     wm::ActivateWindow(window_);
   }
 }
 
 aura::Window*
 ScopedTransformOverviewWindow::GetOverviewWindowForMinimizedState() const {
   return minimized_widget_ ? minimized_widget_->GetNativeWindow() : nullptr;
 }
@@ skipping 21 matching lines @@
   // In unit tests, the content view can have empty size.
   if (!preferred.IsEmpty()) {
     int inset = bounds.height() - preferred.height();
     bounds.Inset(0, 0, 0, inset);
   }
   minimized_widget_->SetBounds(bounds);
   minimized_widget_->Show();
 }
 
 }  // namespace ash