Revert of Cros Tablet Window management - Split Screen part II

ash/wm/overview/window_selector_item.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/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/cleanup_animation_observer.h"
 #include "ash/wm/overview/overview_animation_type.h"
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
-#include "ash/wm/overview/window_grid.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/auto_reset.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ skipping 63 matching lines @@
 // Duration of background opacity transition for the selected label.
 static const int kSelectorFadeInMilliseconds = 350;
 
 // Duration of background opacity transition when exiting overview mode.
 static const int kExitFadeInMilliseconds = 30;
 
 // Before closing a window animate both the window and the caption to shrink by
 // this fraction of size.
 static const float kPreCloseScale = 0.02f;
 
-// Before dragging an overview window, the window will scale up |kPreDragScale|
-// to indicate its selection.
-static const float kDragWindowScale = 0.04f;
-
 // Convenience method to fade in a Window with predefined animation settings.
 // Note: The fade in animation will occur after a delay where the delay is how
 // long the lay out animations take.
 void SetupFadeInAfterLayout(views::Widget* widget) {
   aura::Window* window = widget->GetNativeWindow();
   window->layer()->SetOpacity(0.0f);
   ScopedOverviewAnimationSettings scoped_overview_animation_settings(
       OverviewAnimationType::OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN,
       window);
   window->layer()->SetOpacity(1.0f);
 }
 
-// A Button that has a listener and listens to mouse / gesture events on the
-// visible part of an overview window. Note that the drag events are only
-// handled in maximized mode.
+// A Button that has a listener and listens to mouse clicks on the visible part
+// of an overview window.
 class ShieldButton : public views::CustomButton {
  public:
   ShieldButton(views::ButtonListener* listener, const base::string16& name)
       : views::CustomButton(listener) {
     SetAccessibleName(name);
   }
   ~ShieldButton() override {}
 
   // When WindowSelectorItem (which is a ButtonListener) is destroyed, its
   // |item_widget_| is allowed to stay around to complete any animations.
   // Resetting the listener in all views that are targeted by events is
   // necessary to prevent a crash when a user clicks on the fading out widget
   // after the WindowSelectorItem has been destroyed.
   void ResetListener() { listener_ = nullptr; }
 
-  // views::CustomButton:
-  bool OnMousePressed(const ui::MouseEvent& event) override {
-    if (listener() && SplitViewController::ShouldAllowSplitView()) {
-      gfx::Point location(event.location());
-      views::View::ConvertPointToScreen(this, &location);
-      listener()->HandlePressEvent(location);
-      return true;
-    }
-    return views::CustomButton::OnMousePressed(event);
-  }
-
-  void OnMouseReleased(const ui::MouseEvent& event) override {
-    if (listener() && SplitViewController::ShouldAllowSplitView()) {
-      gfx::Point location(event.location());
-      views::View::ConvertPointToScreen(this, &location);
-      listener()->HandleReleaseEvent(location);
-      return;
-    }
-    views::CustomButton::OnMouseReleased(event);
-  }
-
-  bool OnMouseDragged(const ui::MouseEvent& event) override {
-    if (listener() && SplitViewController::ShouldAllowSplitView()) {
-      gfx::Point location(event.location());
-      views::View::ConvertPointToScreen(this, &location);
-      listener()->HandleDragEvent(location);
-      return true;
-    }
-    return views::CustomButton::OnMouseDragged(event);
-  }
-
-  void OnGestureEvent(ui::GestureEvent* event) override {
-    if (listener() && SplitViewController::ShouldAllowSplitView()) {
-      gfx::Point location(event->location());
-      views::View::ConvertPointToScreen(this, &location);
-      switch (event->type()) {
-        case ui::ET_GESTURE_SCROLL_BEGIN:
-        case ui::ET_GESTURE_TAP_DOWN:
-          listener()->HandlePressEvent(location);
-          break;
-        case ui::ET_GESTURE_SCROLL_UPDATE:
-          listener()->HandleDragEvent(location);
-          break;
-        case ui::ET_GESTURE_END:
-          listener()->HandleReleaseEvent(location);
-          break;
-        default:
-          break;
-      }
-      event->SetHandled();
-      return;
-    }
-    views::CustomButton::OnGestureEvent(event);
-  }
-
-  WindowSelectorItem* listener() {
-    return static_cast<WindowSelectorItem*>(listener_);
-  }
-
  protected:
   // views::View:
   const char* GetClassName() const override { return "ShieldButton"; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShieldButton);
 };
 
 }  // namespace
 
@@ skipping 247 matching lines @@
  private:
   ShieldButton* listener_button_;
   WindowSelectorItem::RoundedContainerView* background_;
   views::Label* label_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptionContainerView);
 };
 
 WindowSelectorItem::WindowSelectorItem(aura::Window* window,
-                                       WindowSelector* window_selector,
-                                       WindowGrid* window_grid)
+                                       WindowSelector* window_selector)
     : dimmed_(false),
       root_window_(window->GetRootWindow()),
-      transform_window_(this, window),
+      transform_window_(window),
       in_bounds_update_(false),
       selected_(false),
       caption_container_view_(nullptr),
       label_view_(nullptr),
       close_button_(new OverviewCloseButton(this)),
       window_selector_(window_selector),
-      background_view_(nullptr),
-      window_grid_(window_grid) {
+      background_view_(nullptr) {
   CreateWindowLabel(window->GetTitle());
   GetWindow()->AddObserver(this);
 }
 
 WindowSelectorItem::~WindowSelectorItem() {
   GetWindow()->RemoveObserver(this);
 }
 
 aura::Window* WindowSelectorItem::GetWindow() {
   return transform_window_.window();
@@ skipping 115 matching lines @@
     if (ash::Shell::Get()
             ->maximize_mode_controller()
             ->IsMaximizeModeWindowManagerEnabled()) {
       ash::Shell::Get()->metrics()->RecordUserMetricsAction(
           ash::UMA_TABLET_WINDOW_CLOSE_THROUGH_OVERVIEW_CLOSE_BUTTON);
     }
     CloseWindow();
     return;
   }
   CHECK(sender == caption_container_view_->listener_button());
-
-  // For other cases, the event is handled in OverviewWindowDragController.
-  if (!SplitViewController::ShouldAllowSplitView())
-    window_selector_->SelectWindow(this);
+  window_selector_->SelectWindow(this);
 }
 
 void WindowSelectorItem::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
   transform_window_.OnWindowDestroyed();
 }
 
 void WindowSelectorItem::OnWindowTitleChanged(aura::Window* window) {
   // TODO(flackr): Maybe add the new title to a vector of titles so that we can
   // filter any of the titles the window had while in the overview session.
   label_view_->SetText(window->GetTitle());
   UpdateAccessibilityName();
 }
 
 float WindowSelectorItem::GetItemScale(const gfx::Size& size) {
   gfx::Size inset_size(size.width(), size.height() - 2 * kWindowMargin);
   return ScopedTransformOverviewWindow::GetItemScale(
       transform_window_.GetTargetBoundsInScreen().size(), inset_size,
       transform_window_.GetTopInset(),
       close_button_->GetPreferredSize().height());
 }
 
-void WindowSelectorItem::HandlePressEvent(
-    const gfx::Point& location_in_screen) {
-  StartDrag();
-  window_selector_->InitiateDrag(this, location_in_screen);
-}
-
-void WindowSelectorItem::HandleReleaseEvent(
-    const gfx::Point& location_in_screen) {
-  EndDrag();
-  window_selector_->CompleteDrag(this);
-}
-
-void WindowSelectorItem::HandleDragEvent(const gfx::Point& location_in_screen) {
-  window_selector_->Drag(this, location_in_screen);
-}
-
 gfx::Rect WindowSelectorItem::GetTargetBoundsInScreen() const {
   return transform_window_.GetTargetBoundsInScreen();
 }
 
 void WindowSelectorItem::SetItemBounds(const gfx::Rect& target_bounds,
                                        OverviewAnimationType animation_type) {
   DCHECK(root_window_ == GetWindow()->GetRootWindow());
   gfx::Rect screen_rect = transform_window_.GetTargetBoundsInScreen();
 
   // Avoid division by zero by ensuring screen bounds is not empty.
@@ skipping 167 matching lines @@
 }
 
 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
   return background_view_ ? background_view_->animation() : nullptr;
 }
 
 aura::Window* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() {
   return transform_window_.GetOverviewWindowForMinimizedState();
 }
 
-void WindowSelectorItem::StartDrag() {
-  gfx::Rect scaled_bounds(target_bounds_);
-  scaled_bounds.Inset(-target_bounds_.width() * kDragWindowScale,
-                      -target_bounds_.height() * kDragWindowScale);
-  OverviewAnimationType animation_type =
-      OverviewAnimationType::OVERVIEW_ANIMATION_DRAGGING_SELECTOR_ITEM;
-  SetBounds(scaled_bounds, animation_type);
-
-  aura::Window* widget_window = item_widget_->GetNativeWindow();
-  if (widget_window && widget_window->parent() == GetWindow()->parent()) {
-    // TODO(xdai): This might not work if there is an always on top window.
-    // See crbug.com/733760.
-    widget_window->parent()->StackChildAtTop(widget_window);
-    widget_window->parent()->StackChildBelow(GetWindow(), widget_window);
-  }
-}
-
-void WindowSelectorItem::EndDrag() {
-  // First stack this item's window below the snapped window if split view mode
-  // is active.
-  aura::Window* dragged_window = GetWindow();
-  aura::Window* dragged_widget_window = item_widget_->GetNativeWindow();
-  aura::Window* parent_window = dragged_widget_window->parent();
-  if (Shell::Get()->IsSplitViewModeActive()) {
-    aura::Window* snapped_window =
-        Shell::Get()->split_view_controller()->GetDefaultSnappedWindow();
-    if (snapped_window->parent() == parent_window &&
-        dragged_window->parent() == parent_window) {
-      parent_window->StackChildBelow(dragged_widget_window, snapped_window);
-      parent_window->StackChildBelow(dragged_window, dragged_widget_window);
-    }
-  }
-
-  // Then find the window which was stacked right above this selector item's
-  // window before dragging and stack this selector item's window below it.
-  const std::vector<std::unique_ptr<WindowSelectorItem>>& selector_items =
-      window_grid_->window_list();
-  aura::Window* stacking_target = nullptr;
-  for (size_t index = 0; index < selector_items.size(); index++) {
-    if (index > 0) {
-      aura::Window* window = selector_items[index - 1].get()->GetWindow();
-      if (window->parent() == parent_window &&
-          dragged_window->parent() == parent_window) {
-        stacking_target = window;
-      }
-    }
-    if (selector_items[index].get() == this && stacking_target) {
-      parent_window->StackChildBelow(dragged_widget_window, stacking_target);
-      parent_window->StackChildBelow(dragged_window, dragged_widget_window);
-      break;
-    }
-  }
-}
-
 }  // namespace ash