athena: Allow getting into split-view mode from overview-mode.

athena/wm/window_manager_impl.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/public/window_manager.h"
 
 #include <algorithm>
 
 #include "athena/common/container_priorities.h"
 #include "athena/input/public/accelerator_manager.h"
@@ skipping 42 matching lines @@
   void SetInOverview(bool active);
 
   void InstallAccelerators();
 
   // WindowManager:
   virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
   virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
 
   // WindowOverviewModeDelegate:
   virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
+  virtual void OnSplitViewMode(aura::Window* left,
+                               aura::Window* right) OVERRIDE;
 
   // aura::WindowObserver
   virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // AcceleratorHandler:
   virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
   virtual bool OnAcceleratorFired(int command_id,
                                   const ui::Accelerator& accelerator) OVERRIDE;
 
@@ skipping 131 matching lines @@
 void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
   mru_window_tracker_->MoveToFront(window);
   wm::ActivateWindow(window);
   SetInOverview(false);
 }
 
+void WindowManagerImpl::OnSplitViewMode(aura::Window* left,
+                                        aura::Window* right) {
+  SetInOverview(false);
+  split_view_controller_->ActivateSplitMode(left, right);
+}
+
 void WindowManagerImpl::OnWindowAdded(aura::Window* new_window) {
   if (new_window->type() == ui::wm::WINDOW_TYPE_NORMAL)
     SetInOverview(false);
 }
 
 void WindowManagerImpl::OnWindowDestroying(aura::Window* window) {
   if (window == container_)
     container_.reset();
 }
 
@@ skipping 84 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena