Add shoftcut (ctrl-f6) to toggle split view

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/window_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/common/container_priorities.h"
 #include "athena/screen/public/screen_manager.h"
@@ skipping 174 matching lines @@
     overview_.reset();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
                       OnOverviewModeExit());
   }
 }
 
 void WindowManagerImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
       {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, CMD_TOGGLE_OVERVIEW,
        AF_NONE},
+      {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_CONTROL_DOWN,
+       CMD_TOGGLE_SPLIT_VIEW, AF_NONE},
   };
   AcceleratorManager::Get()->RegisterAccelerators(
       accelerator_data, arraysize(accelerator_data), this);
 }
 
 void WindowManagerImpl::AddObserver(WindowManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void WindowManagerImpl::OnSelectWindow(aura::Window* 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) {
+  // TODO(oshima): Creating a new window should updates the ovewview mode
+  // instead of exitting.
   if (new_window->type() == ui::wm::WINDOW_TYPE_NORMAL)
     SetInOverview(false);
 }
 
 void WindowManagerImpl::OnWindowDestroying(aura::Window* window) {
   if (window == container_)
     container_.reset();
 }
 
 bool WindowManagerImpl::IsCommandEnabled(int command_id) const {
   return true;
 }
 
 bool WindowManagerImpl::OnAcceleratorFired(int command_id,
                                            const ui::Accelerator& accelerator) {
   switch (command_id) {
     case CMD_TOGGLE_OVERVIEW:
       ToggleOverview();
       break;
+    case CMD_TOGGLE_SPLIT_VIEW:
+      ToggleSplitview();
+      break;
   }
   return true;
 }
 
+void WindowManagerImpl::ToggleSplitview() {
+  // TODO(oshima): Figure out what to do.
+  if (IsOverviewModeActive())
+    return;
+
+  if (split_view_controller_->IsSplitViewModeActive()) {
+    split_view_controller_->DeactivateSplitMode();
+    // Relayout so that windows are maximzied.
+    container_->layout_manager()->OnWindowResized();
+  } else if (window_list_provider_->GetWindowList().size() > 1) {
+    const aura::Window::Windows& windows =
+        window_list_provider_->GetWindowList();
+    aura::Window* left = *windows.rbegin();
+    aura::Window* right = *(windows.rbegin() + 1);
+    split_view_controller_->ActivateSplitMode(left, right);

[sadrul, 2014/08/19 16:27:53]

Doing ActivateSplitMode(NULL, NULL) should also work correctly.

[oshima, 2014/08/19 17:05:33]

good to know. done.

+  }
+}
+
 aura::Window* WindowManagerImpl::GetWindowBehind(aura::Window* window) {
   const aura::Window::Windows& windows = window_list_provider_->GetWindowList();
   aura::Window::Windows::const_reverse_iterator iter =
       std::find(windows.rbegin(), windows.rend(), window);
   CHECK(iter != windows.rend());
   ++iter;
   aura::Window* behind = NULL;
   if (iter != windows.rend())
     behind = *iter++;
 
@@ skipping 57 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena