Add shoftcut (ctrl-f6) to toggle split view

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/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
@@ skipping 145 matching lines @@
         base::Bind(&SplitViewController::OnAnimationCompleted,
                    weak_factory_.GetWeakPtr(),
                    window)));
     window->SetTransform(transform);
   } else {
     window->SetTransform(transform);
   }
 }
 
 void SplitViewController::OnAnimationCompleted(aura::Window* window) {
+  // Animation can be cancelled when deactivated.
+  if (left_window_ == NULL)
+    return;
   DCHECK(window == left_window_ || window == right_window_);
   if (state_ == ACTIVE) {
     gfx::Rect window_bounds = gfx::Rect(container_->bounds().size());
     int container_width = window_bounds.width();
     window_bounds.set_width(container_width / 2);
     window->SetTransform(gfx::Transform());
     if (window == left_window_) {
       left_window_->SetBounds(window_bounds);
     } else {
       window_bounds.set_x(container_width / 2);
@@ skipping 88 matching lines @@
 }
 
 bool SplitViewController::CanScroll() {
   // TODO(mfomitchev): return false in vertical orientation, in full screen.
   bool result = (!IsSplitViewModeActive() &&
                  window_list_provider_->GetWindowList().size() >= 2);
   return result;
 }
 
 }  // namespace athena