Revert of Cros Tablet Window management - Split Screen part II

ash/wm/splitview/split_view_controller.cc

 // Copyright 2017 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/splitview/split_view_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 110 matching lines @@
 aura::Window* SplitViewController::GetDefaultSnappedWindow() {
   if (default_snap_position_ == LEFT)
     return left_window_;
   if (default_snap_position_ == RIGHT)
     return right_window_;
   return nullptr;
 }
 
 gfx::Rect SplitViewController::GetSnappedWindowBoundsInParent(
     aura::Window* window,
-    SnapPosition snap_position) {
-  if (snap_position == LEFT)
+    State snap_state) {
+  if (snap_state == LEFT_SNAPPED)
     return GetLeftWindowBoundsInParent(window);
-  else if (snap_position == RIGHT)
+  else if (snap_state == RIGHT_SNAPPED)
     return GetRightWindowBoundsInParent(window);
 
   NOTREACHED();
   return gfx::Rect();
 }
 
 gfx::Rect SplitViewController::GetSnappedWindowBoundsInScreen(
     aura::Window* window,
-    SnapPosition snap_position) {
-  if (snap_position == LEFT)
+    State snap_state) {
+  if (snap_state == LEFT_SNAPPED)
     return GetLeftWindowBoundsInScreen(window);
-  else if (snap_position == RIGHT)
+  else if (snap_state == RIGHT_SNAPPED)
     return GetRightWindowBoundsInScreen(window);
 
   NOTREACHED();
   return gfx::Rect();
 }
 
 gfx::Rect SplitViewController::GetDisplayWorkAreaBoundsInParent(
     aura::Window* window) {
   aura::Window* root_window = window->GetRootWindow();
   return ScreenUtil::GetDisplayWorkAreaBoundsInParent(
@@ skipping 56 matching lines @@
   // Only window in MRU list can be snapped.
   aura::Window::Windows windows =
       Shell::Get()->mru_window_tracker()->BuildMruWindowList();
   if (std::find(windows.begin(), windows.end(), gained_active) == windows.end())
     return;
 
   // Snap the window on the non-default side of the screen if split view mode
   // is active.
   if (default_snap_position_ == LEFT)
     SnapWindow(gained_active, SplitViewController::RIGHT);
-  else if (default_snap_position_ == RIGHT)
+  else
     SnapWindow(gained_active, SplitViewController::LEFT);
 }
 
 void SplitViewController::OnOverviewModeStarting() {
   // If split view mode is active, reset |state_| to make it be able to select
   // another window from overview window grid.
   if (IsSplitViewModeActive()) {
     State previous_state = state_;
     if (default_snap_position_ == LEFT) {
       StopObserving(right_window_);
       state_ = LEFT_SNAPPED;
-    } else if (default_snap_position_ == RIGHT) {
+    } else {
       StopObserving(left_window_);
       state_ = RIGHT_SNAPPED;
     }
     NotifySplitViewStateChanged(previous_state, state_);
   }
 }
 
 void SplitViewController::OnOverviewModeEnded() {
   // If split view mode is active but only has one snapped window, use the MRU
   // window list to auto select another window to snap.
   if (IsSplitViewModeActive() && state_ != BOTH_SNAPPED) {
     aura::Window::Windows windows =
         Shell::Get()->mru_window_tracker()->BuildMruWindowList();
     for (auto* window : windows) {
       if (CanSnap(window) && window != GetDefaultSnappedWindow()) {
         if (default_snap_position_ == LEFT)
           SnapWindow(window, SplitViewController::RIGHT);
-        else if (default_snap_position_ == RIGHT)
+        else
           SnapWindow(window, SplitViewController::LEFT);
         break;
       }
     }
   }
 }
 
 void SplitViewController::EndSplitView() {
   StopObserving(left_window_);
   StopObserving(right_window_);
   left_window_ = nullptr;
   right_window_ = nullptr;
-  default_snap_position_ = NONE;
+  default_snap_position_ = LEFT;
   divider_position_ = -1;
 
   State previous_state = state_;
   state_ = NO_SNAP;
   NotifySplitViewStateChanged(previous_state, state_);
 
   Shell::Get()->NotifySplitViewModeEnded();
 }
 
 void SplitViewController::StartObserving(aura::Window* window) {
@@ skipping 53 matching lines @@
     divider_position_ =
         display_bounds_in_screen.x() + display_bounds_in_screen.width() * 0.5f;
   }
   return gfx::Rect(divider_position_, display_bounds_in_screen.y(),
                    display_bounds_in_screen.x() +
                        display_bounds_in_screen.width() - divider_position_,
                    display_bounds_in_screen.height());
 }
 
 }  // namespace ash