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 155 matching lines @@
   // 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;
   }
 
+  left_window_->layer()->SetOpacity(1.0f);
   left_window_->Show();
+  right_window_->layer()->SetOpacity(1.0f);
   right_window_->Show();
   if (state_ == ACTIVE) {
     if (animate) {
       gfx::Transform left_transform = GetTargetTransformForBoundsAnimation(
           left_window_->bounds(), GetLeftTargetBounds());
       gfx::Transform right_transform = GetTargetTransformForBoundsAnimation(
           right_window_->bounds(), GetRightTargetBounds());
       SetWindowTransforms(left_transform, right_transform, true);
     } else {
       left_window_->SetBounds(GetLeftTargetBounds());
@@ skipping 125 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