Ensure that an activity is activated when overview mode is exited

athena/wm/split_view_controller.cc

 // Copyright 2014 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 "athena/wm/split_view_controller.h"
 
 #include <cmath>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_list_provider.h"
@@ skipping 47 matching lines @@
 
 bool SplitViewController::IsSplitViewModeActive() const {
   return state_ == ACTIVE;
 }
 
 void SplitViewController::ActivateSplitMode(aura::Window* left,
                                             aura::Window* right) {
   aura::Window::Windows windows = window_list_provider_->GetWindowList();
   aura::Window::Windows::reverse_iterator iter = windows.rbegin();
   if (state_ == ACTIVE) {
-    if (left_window_ == right)
-      left_window_ = left;
-    if (right_window_ == left)
-      right_window_ = right;
-
-    if (!left)
+    if (!left && left_window_ != right)
       left = left_window_;
-    if (!right)
+    if (!right && right_window_ != left)
       right = right_window_;
   }
 
   if (!left && iter != windows.rend()) {
     left = *iter;
     iter++;
     if (left == right && iter != windows.rend()) {
       left = *iter;
       iter++;
     }
   }
 
   if (!right && iter != windows.rend()) {
     right = *iter;
     iter++;
     if (right == left && iter != windows.rend()) {
       right = *iter;
       iter++;
     }
   }
 
+  to_hide_.clear();
+  if (left_window_ && left_window_ != left && left_window_ != right)
+    to_hide_.push_back(left_window_);
+  if (right_window_ && right_window_ != left && right_window_ != right)
+    to_hide_.push_back(right_window_);
+
   SetState(ACTIVE);
   right_window_ = right;
   left_window_ = left;
   UpdateLayout(true);
 }
 
 void SplitViewController::ReplaceWindow(aura::Window* window,
                                         aura::Window* replace_with) {
   CHECK(IsSplitViewModeActive());
   CHECK(replace_with);
@@ skipping 41 matching lines @@
     return;
 
   state_ = state;
   ScreenManager::Get()->SetRotationLocked(state_ != INACTIVE);
 }
 
 void SplitViewController::UpdateLayout(bool animate) {
   CHECK(left_window_);
   CHECK(right_window_);
 
-  // Splitview can be activated from SplitViewController::ActivateSplitMode or
-  // SplitViewController::ScrollEnd. Additionally we don't want to rotate the
-  // screen while engaging splitview (i.e. state_ == SCROLLING).
-  if (state_ == INACTIVE && !animate) {
-    if (!wm::IsActiveWindow(left_window_))
-      left_window_->Hide();
-    if (!wm::IsActiveWindow(right_window_))
-      right_window_->Hide();
-    SetWindowTransforms(gfx::Transform(), gfx::Transform(), false);
-    return;
+  if (!animate) {
+    for (size_t i = 0; i < to_hide_.size(); ++i)
+      to_hide_[i]->Hide();
+    to_hide_.clear();
+
+    if (state_ == INACTIVE) {
+      if (!wm::IsActiveWindow(left_window_))
+        left_window_->Hide();
+      if (!wm::IsActiveWindow(right_window_))
+        right_window_->Hide();
+
+      SetWindowTransforms(gfx::Transform(), gfx::Transform(), false);
+      return;
+    }
   }
 
   left_window_->Show();
   right_window_->Show();
   window_list_provider_->MoveToFront(right_window_);
   window_list_provider_->MoveToFront(left_window_);
 
   if (state_ == ACTIVE) {
     if (animate) {
       gfx::Transform left_transform = GetTargetTransformForBoundsAnimation(
@@ skipping 131 matching lines @@
 bool SplitViewController::CanScroll() {
   // TODO(mfomitchev): return false in full screen.
   bool result = (!IsSplitViewModeActive() &&
                  window_list_provider_->GetWindowList().size() >= 2 &&
                  IsLandscapeOrientation(gfx::Screen::GetNativeScreen()->
                      GetDisplayNearestWindow(container_).rotation()));
   return result;
 }
 
 }  // namespace athena