Cros Tablet Window management - Split Screen part II

ash/wm/overview/window_selector.h

Index: ash/wm/overview/window_selector.h
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index 72913ff2badd476cdcfd4ce87af70a332015fc36..9db2bd5b63dff91ef5ed2b500ee166be82f3a902 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -13,10 +13,12 @@
 #include <vector>
 
 #include "ash/ash_export.h"
+#include "ash/wm/splitview/split_view_controller.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
+#include "ui/gfx/geometry/point.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/wm/public/activation_change_observer.h"
@@ -31,13 +33,15 @@ class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
 class WindowGrid;
+class OverviewWindowDragController;
 
 // The WindowSelector shows a grid of all of your windows, allowing to select
 // one by clicking or tapping on it.
 class ASH_EXPORT WindowSelector : public display::DisplayObserver,
                                   public aura::WindowObserver,
                                   public ::wm::ActivationChangeObserver,
-                                  public views::TextfieldController {
+                                  public views::TextfieldController,
+                                  public SplitViewController::Observer {
  public:
   // Returns true if the window can be selected in overview mode.
   static bool IsSelectable(aura::Window* window);
@@ -75,6 +79,20 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
   // Called when |window| is about to get closed.
   void WindowClosing(WindowSelectorItem* window);
 
+  // Called to set bounds for window grids. Used for split view.
+  void SetBoundsForWindowGridsInScreen(const gfx::Rect& bounds);

[varkha, 2017/06/30 16:32:26]

nit: should we forward-declare gfx::Rect above? 

[xdai1, 2017/07/06 00:35:49]

Done.

+
+  // Removes the window selector item from the overview window grid.
+  void RemoveWindowSelectorItem(WindowSelectorItem* item);
+
+  void InitiateDrag(WindowSelectorItem* item,
+                    const gfx::Point& location_in_screen);

[varkha, 2017/06/30 16:32:26]

nit: ditto for gfx::Point - can we forward declare and move the include to .cc?

[xdai1, 2017/07/06 00:35:49]

Done.

+  void Drag(WindowSelectorItem* item, const gfx::Point& location_in_screen);
+  void CompleteDrag(WindowSelectorItem* item);
+
+  // Positions all of the windows in the overview.
+  void PositionWindows(bool animate);
+
   WindowSelectorDelegate* delegate() { return delegate_; }
 
   bool restoring_minimized_windows() const {
@@ -85,6 +103,10 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
 
   bool is_shut_down() const { return is_shut_down_; }
 
+  const std::vector<std::unique_ptr<WindowGrid>>& grid_list_for_testing() {

[varkha, 2017/06/30 16:32:26]

nit: this method can be marked as const.

[xdai1, 2017/07/06 00:35:49]

Done.

+    return grid_list_;
+  }
+
   // display::DisplayObserver:
   void OnDisplayAdded(const display::Display& display) override;
   void OnDisplayRemoved(const display::Display& display) override;
@@ -108,15 +130,16 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
+  // SplitViewController::Observer:
+  void OnSplitViewStateChanged(SplitViewController::State previous_state,
+                               SplitViewController::State state) override;
+
  private:
   friend class WindowSelectorTest;
 
   // Returns the aura::Window for |text_filter_widget_|.
   aura::Window* GetTextFilterWidgetWindow();
 
-  // Position all of the windows in the overview.
-  void PositionWindows(bool animate);
-
   // Repositions and resizes |text_filter_widget_| on
   // DisplayMetricsChanged event.
   void RepositionTextFilterOnDisplayMetricsChange();
@@ -193,6 +216,9 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
 
   bool is_shut_down_ = false;
 
+  // The drag controller for a window in the overview mode.
+  std::unique_ptr<OverviewWindowDragController> window_drag_controller_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };