Change behaviour of the Alt-] and Alt-[ keys so that it cycles through SnapLeft/SnapRight to DockLe…

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/accelerators/accelerator_controller.h"
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_animator.h"
+#include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/lock_state_controller.h"
+#include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
@@ skipping 225 matching lines @@
   }
   static bool is_ui_shown(ExitWarningHandler* ewh) {
     return !!ewh->widget_;
   }
   static bool is_idle(ExitWarningHandler* ewh) {
     return ewh->state_ == ExitWarningHandler::IDLE;
   }
   static bool is_exiting(ExitWarningHandler* ewh) {
     return ewh->state_ == ExitWarningHandler::EXITING;
   }
+  aura::Window* CreatePanel() {
+    aura::Window* window =
+      CreateTestWindowInShellWithDelegateAndType(NULL,
+        ui::wm::WINDOW_TYPE_PANEL, 0, gfx::Rect(5, 5, 20, 20));
+    test::TestShelfDelegate* shelf_delegate =
+      test::TestShelfDelegate::instance();
+    shelf_delegate->AddShelfItem(window);
+    PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
+        Shell::GetContainer(window->GetRootWindow(),
+                            kShellWindowId_PanelContainer)->layout_manager());
+    manager->Relayout();
+    return window;
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerTest);
 };
 
 AcceleratorController* AcceleratorControllerTest::GetController() {
   return Shell::GetInstance()->accelerator_controller();
 }
 
 #if !defined(OS_WIN)
@@ skipping 147 matching lines @@
 TEST_F(AcceleratorControllerTest, WindowSnap) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   const ui::Accelerator dummy;
 
   wm::WindowState* window_state = wm::GetWindowState(window.get());
 
   window_state->Activate();
 
   {
-    GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
+    GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
     gfx::Rect expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(
         window.get());
     EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
   }
   {
-    GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
+    GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
     gfx::Rect expected_bounds = wm::GetDefaultRightSnappedWindowBoundsInParent(
         window.get());
     EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
   }
   {
     gfx::Rect normal_bounds = window_state->GetRestoreBoundsInParent();
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_TRUE(window_state->IsMaximized());
     EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_FALSE(window_state->IsMaximized());
     // Window gets restored to its restore bounds since side-maximized state
     // is treated as a "maximized" state.
     EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
-    GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
+    GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
     EXPECT_FALSE(window_state->IsMaximized());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
-    GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
+    GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
     EXPECT_FALSE(window_state->IsMaximized());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_TRUE(window_state->IsMaximized());
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     EXPECT_FALSE(window_state->IsMaximized());
     EXPECT_TRUE(window_state->IsMinimized());
     window_state->Restore();
     window_state->Activate();
   }
   {
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     EXPECT_TRUE(window_state->IsMinimized());
   }
 }
 
+TEST_F(AcceleratorControllerTest, WindowDock) {
+  scoped_ptr<aura::Window> window0(
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+  {
+    scoped_ptr<aura::Window> window1(
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+    const ui::Accelerator dummy;
+
+    wm::WindowState* window1_state = wm::GetWindowState(window1.get());
+    window1_state->Activate();
+
+    // check snap left, dock left, restore cycle

[varkha, 2014/09/29 21:04:34]

Comments should be English sentences - capitalized and ending with punctuation.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Punctuation,_...

+    {
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      gfx::Rect normal_bounds = window1_state->GetRestoreBoundsInParent();
+      gfx::Rect expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(
+                                    window1.get());
+      EXPECT_EQ(expected_bounds.ToString(), window1->bounds().ToString());
+      EXPECT_TRUE(window1_state->IsSnapped());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      EXPECT_FALSE(window1_state->IsNormalOrSnapped());
+      EXPECT_TRUE(window1_state->IsDocked());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      EXPECT_FALSE(window1_state->IsDocked());
+      EXPECT_EQ(normal_bounds.ToString(), window1->bounds().ToString());
+    }
+    // check snap right, dock right, restore cycle

[varkha, 2014/09/29 21:04:34]

Consider separating those into separate methods. It is easier to track breakage
when one particular small test breaks rather than one of several cases in a
single test.

[dtapuska, 2014/09/30 14:40:49]

Done.

+    {
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      gfx::Rect normal_bounds = window1_state->GetRestoreBoundsInParent();
+      gfx::Rect expected_bounds =
+        wm::GetDefaultRightSnappedWindowBoundsInParent(window1.get());
+      EXPECT_EQ(expected_bounds.ToString(), window1->bounds().ToString());
+      EXPECT_TRUE(window1_state->IsSnapped());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      EXPECT_FALSE(window1_state->IsNormalOrSnapped());
+      EXPECT_TRUE(window1_state->IsDocked());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      EXPECT_FALSE(window1_state->IsDocked());
+      EXPECT_EQ(normal_bounds.ToString(), window1->bounds().ToString());
+    }
+
+    // check snap left, dock left, snap right
+    {
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      gfx::Rect expected_bounds =
+        wm::GetDefaultLeftSnappedWindowBoundsInParent(window1.get());
+      gfx::Rect expected_bounds2 =
+        wm::GetDefaultRightSnappedWindowBoundsInParent(window1.get());
+      EXPECT_EQ(expected_bounds.ToString(), window1->bounds().ToString());
+      EXPECT_TRUE(window1_state->IsSnapped());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      EXPECT_FALSE(window1_state->IsNormalOrSnapped());
+      EXPECT_TRUE(window1_state->IsDocked());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      EXPECT_FALSE(window1_state->IsDocked());
+      EXPECT_TRUE(window1_state->IsSnapped());
+      EXPECT_EQ(expected_bounds2.ToString(), window1->bounds().ToString());
+    }
+
+    // check snap left, dock left, snap right
+    {
+      scoped_ptr<aura::Window> window2(
+        CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+
+      wm::WindowState* window2_state = wm::GetWindowState(window2.get());
+
+      scoped_ptr<aura::Window> window3(
+        CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+
+      wm::WindowState* window3_state = wm::GetWindowState(window3.get());
+      window3_state->Activate();
+
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      gfx::Rect window3_docked_bounds = window3->bounds();
+
+      window2_state->Activate();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      window1_state->Activate();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+
+      EXPECT_TRUE(window3_state->IsDocked());
+      EXPECT_TRUE(window2_state->IsDocked());
+      EXPECT_TRUE(window1_state->IsDocked());
+      EXPECT_TRUE(window3_state->IsMinimized());
+
+      window1_state->Activate();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      window2_state->Activate();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      window3_state->Unminimize();
+      EXPECT_FALSE(window1_state->IsDocked());
+      EXPECT_FALSE(window2_state->IsDocked());
+      EXPECT_TRUE(window3_state->IsDocked());
+      EXPECT_EQ(window3_docked_bounds.ToString(), window3->bounds().ToString());
+    }
+  }
+
+  // Panel docking tests
+  {
+    scoped_ptr<aura::Window> window(CreatePanel());
+
+    const ui::Accelerator dummy;
+
+    wm::WindowState* window_state = wm::GetWindowState(window.get());
+
+    window_state->Activate();
+
+    // check snap left (doesn't apply for panels), dock left, dock, right,
+    // restore cycle
+    {
+      gfx::Rect window_restore_bounds2 = window->bounds();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
+      gfx::Rect expected_bounds =
+          wm::GetDefaultLeftSnappedWindowBoundsInParent(window.get());
+      gfx::Rect window_restore_bounds =
+          window_state->GetRestoreBoundsInScreen();
+      EXPECT_NE(expected_bounds.ToString(), window->bounds().ToString());
+      EXPECT_FALSE(window_state->IsSnapped());
+      EXPECT_FALSE(window_state->IsNormalOrSnapped());
+      EXPECT_TRUE(window_state->IsDocked());
+      window_state->Restore();
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      EXPECT_TRUE(window_state->IsDocked());
+      GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
+      EXPECT_FALSE(window_state->IsDocked());
+      EXPECT_EQ(window_restore_bounds.ToString(),
+                window_restore_bounds2.ToString());
+      EXPECT_EQ(window_restore_bounds.ToString(), window->bounds().ToString());
+    }
+  }
+}
+
 TEST_F(AcceleratorControllerTest, CenterWindowAccelerator) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   const ui::Accelerator dummy;
   wm::WindowState* window_state = wm::GetWindowState(window.get());
   window_state->Activate();
 
   // Center the window using accelerator.
   GetController()->PerformAction(WINDOW_POSITION_CENTER, dummy);
   gfx::Rect work_area =
@@ skipping 829 matching lines @@
     window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
     wm::ActivateWindow(window.get());
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
     GetController()->PerformAction(kActionsNeedingWindow[i], dummy);
     EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
   }
 }
 
 }  // namespace ash