athena: Fix overview mode for split-view mode.

athena/wm/window_manager_impl.cc

Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index 638ea88708f9610b7e6aeff70167b0960ac1f332..1ff52fe556ff29749efbdd4ec05621ac18bf329b 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -182,7 +182,6 @@ void WindowManagerImpl::SetInOverview(bool active) {
   bezel_controller_->set_left_right_delegate(
       active ? NULL : split_view_controller_.get());
   if (active) {
-    split_view_controller_->DeactivateSplitMode();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeEnter());
 
     // Re-stack all windows in the order defined by window_list_provider_.
@@ -193,7 +192,6 @@ void WindowManagerImpl::SetInOverview(bool active) {
     overview_ = WindowOverviewMode::Create(
         container_.get(), window_list_provider_.get(), this);
   } else {
-    CHECK(!split_view_controller_->IsSplitViewModeActive());
     overview_.reset();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeExit());
   }
@@ -218,9 +216,45 @@ void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+bool WindowManagerImpl::IsInSplitViewMode(aura::Window** left_window,
+                                          aura::Window** right_window) {
+  if (!split_view_controller_->IsSplitViewModeActive())
+    return false;
+  if (left_window)
+    *left_window = split_view_controller_->left_window();
+  if (right_window)
+    *right_window = split_view_controller_->right_window();
+  return true;
+}
+
 void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
+  if (split_view_controller_->IsSplitViewModeActive())
+    split_view_controller_->DeactivateSplitMode();
   wm::ActivateWindow(window);
   SetInOverview(false);
+  // If |window| does not have the size of the work-area, then make sure it is
+  // resized.
+  const gfx::Size work_area =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size();
+  if (window->GetTargetBounds().size() != work_area) {
+    const gfx::Rect& window_bounds = window->bounds();
+    const gfx::Rect desired_bounds(work_area);
+    gfx::Transform transform;
+    transform.Translate(desired_bounds.x() - window_bounds.x(),
+                        desired_bounds.y() - window_bounds.y());
+    transform.Scale(desired_bounds.width() / window_bounds.width(),
+                    desired_bounds.height() / window_bounds.height());
+    window->layer()->GetAnimator()->AbortAllAnimations();
+    ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
+    settings.SetPreemptionStrategy(
+        ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+    settings.AddObserver(
+        new ui::ClosureAnimationObserver(base::Bind(&SetWindowState,
+                                                    base::Unretained(window),
+                                                    desired_bounds,
+                                                    gfx::Transform())));
+    window->SetTransform(transform);
+  }
 }
 
 void WindowManagerImpl::OnSplitViewMode(aura::Window* left,
@@ -338,7 +372,7 @@ void WindowManagerImpl::OnTitleDragCompleted(aura::Window* window) {
     transform.Translate(window->bounds().x() - next_window->bounds().x(), 0);
     next_window->SetTransform(transform);
 
-    OnSelectWindow(next_window);
+    wm::ActivateWindow(next_window);
   }
   window->Hide();
 }