Cros Tablet Window management - Split Screen part II

ash/wm/splitview/split_view_controller.cc

Index: ash/wm/splitview/split_view_controller.cc
diff --git a/ash/wm/splitview/split_view_controller.cc b/ash/wm/splitview/split_view_controller.cc
index b86b3d5ab17196c903cc0c367c3c911b0dc82111..699c26a77875e592f180c4c4b45a85cca055f424 100644
--- a/ash/wm/splitview/split_view_controller.cc
+++ b/ash/wm/splitview/split_view_controller.cc
@@ -128,10 +128,10 @@ aura::Window* SplitViewController::GetDefaultSnappedWindow() {
 
 gfx::Rect SplitViewController::GetSnappedWindowBoundsInParent(
     aura::Window* window,
-    State snap_state) {
-  if (snap_state == LEFT_SNAPPED)
+    SnapPosition snap_position) {
+  if (snap_position == LEFT)
     return GetLeftWindowBoundsInParent(window);
-  else if (snap_state == RIGHT_SNAPPED)
+  else if (snap_position == RIGHT)
     return GetRightWindowBoundsInParent(window);
 
   NOTREACHED();
@@ -140,10 +140,10 @@ gfx::Rect SplitViewController::GetSnappedWindowBoundsInParent(
 
 gfx::Rect SplitViewController::GetSnappedWindowBoundsInScreen(
     aura::Window* window,
-    State snap_state) {
-  if (snap_state == LEFT_SNAPPED)
+    SnapPosition snap_position) {
+  if (snap_position == LEFT)
     return GetLeftWindowBoundsInScreen(window);
-  else if (snap_state == RIGHT_SNAPPED)
+  else if (snap_position == RIGHT)
     return GetRightWindowBoundsInScreen(window);
 
   NOTREACHED();
@@ -220,7 +220,7 @@ void SplitViewController::OnWindowActivated(ActivationReason reason,
   // is active.
   if (default_snap_position_ == LEFT)
     SnapWindow(gained_active, SplitViewController::RIGHT);
-  else
+  else if (default_snap_position_ == RIGHT)
     SnapWindow(gained_active, SplitViewController::LEFT);
 }
 
@@ -232,7 +232,7 @@ void SplitViewController::OnOverviewModeStarting() {
     if (default_snap_position_ == LEFT) {
       StopObserving(right_window_);
       state_ = LEFT_SNAPPED;
-    } else {
+    } else if (default_snap_position_ == RIGHT) {
       StopObserving(left_window_);
       state_ = RIGHT_SNAPPED;
     }
@@ -250,7 +250,7 @@ void SplitViewController::OnOverviewModeEnded() {
       if (CanSnap(window) && window != GetDefaultSnappedWindow()) {
         if (default_snap_position_ == LEFT)
           SnapWindow(window, SplitViewController::RIGHT);
-        else
+        else if (default_snap_position_ == RIGHT)
           SnapWindow(window, SplitViewController::LEFT);
         break;
       }
@@ -263,7 +263,7 @@ void SplitViewController::EndSplitView() {
   StopObserving(right_window_);
   left_window_ = nullptr;
   right_window_ = nullptr;
-  default_snap_position_ = LEFT;
+  default_snap_position_ = NONE;
   divider_position_ = -1;
 
   State previous_state = state_;