Adding split view divider widget.

athena/wm/split_view_controller.h

Index: athena/wm/split_view_controller.h
diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h
index c6c5e8e23c01f35624982a1a85fe7c0ca24bc7ef..235aa0777d7b67acff673f00e3b927de25e0d3cb 100644
--- a/athena/wm/split_view_controller.h
+++ b/athena/wm/split_view_controller.h
@@ -6,9 +6,12 @@
 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 
 #include "athena/athena_export.h"
+#include "athena/common/drag_handle.h"
 #include "athena/wm/bezel_controller.h"
+#include "athena/wm/public/window_manager_observer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "ui/views/widget/widget.h"
 
 namespace gfx {
 class Rect;
@@ -22,7 +25,9 @@ class SplitViewControllerTest;
 // Responsible for entering split view mode, exiting from split view mode, and
 // laying out the windows in split view mode.
 class ATHENA_EXPORT SplitViewController
-    : public BezelController::ScrollDelegate {
+    : public BezelController::ScrollDelegate,
+      public DragHandle::ScrollDelegate,
+      public WindowManagerObserver {
  public:
   SplitViewController(aura::Window* container,
                       WindowListProvider* window_list_provider);
@@ -45,12 +50,10 @@ class ATHENA_EXPORT SplitViewController
   void ReplaceWindow(aura::Window* window,
                      aura::Window* replace_with);
 
-  // Returns the bounds that the left and right windows will have once split
-  // view is active and they are done animating. If |left_window_| and
-  // |right_window_| are still animating this may be different than their
-  // current bounds.
-  gfx::Rect GetLeftTargetBounds();
-  gfx::Rect GetRightTargetBounds();
+  // Returns the bounds of the left and right parts of the |container_| based
+  // on the current value of |divider_position_|.
+  gfx::Rect GetLeftAreaBounds();
+  gfx::Rect GetRightAreaBounds();
 
   aura::Window* left_window() { return left_window_; }
   aura::Window* right_window() { return right_window_; }
@@ -72,10 +75,14 @@ class ATHENA_EXPORT SplitViewController
   };
 
   void SetState(State state);
+
+  views::Widget* CreateDividerWidget();
+
   void UpdateLayout(bool animate);
 
   void SetWindowTransforms(const gfx::Transform& left_transform,
                            const gfx::Transform& right_transform,
+                           const gfx::Transform& divider_transform,
                            bool animate);
 
   // Called when the animation initiated by SetWindowTransforms() completes.
@@ -89,6 +96,17 @@ class ATHENA_EXPORT SplitViewController
   virtual void ScrollUpdate(float delta) OVERRIDE;
   virtual bool CanScroll() OVERRIDE;
 
+  // DragHandle::ScrollDelegate:
+  virtual void HandleScrollBegin(float delta) OVERRIDE;
+  virtual void HandleScrollEnd() OVERRIDE;
+  virtual void HandleScrollUpdate(float delta) OVERRIDE;
+  virtual bool HandleCanScroll() OVERRIDE;
+
+  // WindowManagerObserver:
+  virtual void OnOverviewModeEnter() OVERRIDE;
+  virtual void OnOverviewModeExit() OVERRIDE;
+  virtual void OnActivityOrderHasChanged() OVERRIDE;

[Jun Mukai, 2014/09/08 19:32:00]

You'll have to update and reimplement the new observer methods.

[mfomitchev, 2014/09/12 19:58:42]

Done.

+
   State state_;
 
   aura::Window* container_;
@@ -101,9 +119,11 @@ class ATHENA_EXPORT SplitViewController
   aura::Window* left_window_;
   aura::Window* right_window_;
 
-  // Position of the separator between left_window_ and right_window_ in
-  // container_ coordinates (along the x axis).
-  int separator_position_;
+  // X-Coordinate of the (center of the) divider between left_window_ and
+  // right_window_ in |container_| coordinates.
+  int divider_position_;
+
+  scoped_ptr<views::Widget> divider_widget_;

[Jun Mukai, 2014/09/08 19:32:00]

Usually views::Widget is used as self-owned, not scoped_ptr with
WIDGET_OWNS_NATIVE_WIDGET.

[mfomitchev, 2014/09/12 19:58:42]

Done. The widget is now created once and never destroyed. I had to add a check
for the state to OnOverviewModeExit().

 
   base::WeakPtrFactory<SplitViewController> weak_factory_;