Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 2955203002: Cros Tablet Window management - Split Screen part II (Closed)
Patch Set: Fix the failed ash_unittest. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/overview/window_selector_item.cc ('k') | ash/wm/splitview/split_view_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index d5a07ed5ab3d585fa0f1b5d7e5658b1b1e3c596e..1c0c2f05d7a403a21c1c8ab155449dcab42fe1b4 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -8,6 +8,7 @@
#include "ash/accessibility_delegate.h"
#include "ash/accessibility_types.h"
#include "ash/app_list/test_app_list_view_presenter_impl.h"
+#include "ash/ash_switches.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/public/cpp/config.h"
#include "ash/public/cpp/window_properties.h"
@@ -23,10 +24,12 @@
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/overview/window_selector_item.h"
#include "ash/wm/panels/panel_layout_manager.h"
+#include "ash/wm/splitview/split_view_controller.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "ash/wm/wm_event.h"
#include "ash/wm/workspace/workspace_window_resizer.h"
+#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/user_action_tester.h"
@@ -165,6 +168,10 @@ class WindowSelectorTest : public AshTestBase {
return window_selector_controller()->window_selector_.get();
}
+ SplitViewController* split_view_controller() {
+ return Shell::Get()->split_view_controller();
+ }
+
void ToggleOverview() { window_selector_controller()->ToggleOverview(); }
aura::Window* GetOverviewWindowForMinimizedState(int index,
@@ -1891,4 +1898,73 @@ TEST_F(WindowSelectorTest, OverviewWhileDragging) {
resizer->RevertDrag();
}
+// Tests that dragging a overview window selector item to the edge of the screen
+// snaps the window. If two windows are snapped to left and right side of the
+// screen, exit the overview mode.
+TEST_F(WindowSelectorTest, DragOverviewWindowToSnap) {
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kAshEnableTabletSplitView);
+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ true);
+
+ const gfx::Rect bounds(0, 0, 400, 400);
+ std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
+ std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
+ std::unique_ptr<aura::Window> window3(CreateWindow(bounds));
+
+ ToggleOverview();
+ EXPECT_TRUE(window_selector_controller()->IsSelecting());
+ EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), false);
+
+ // Drag |window1| selector item to snap to left.
+ const int grid_index = 0;
+ WindowSelectorItem* selector_item1 =
+ GetWindowItemForWindow(grid_index, window1.get());
+ const gfx::Rect selector_item_bounds1 = selector_item1->target_bounds();
+ // Start drag in the middle of the seletor item.
+ const gfx::Point start_location1(selector_item_bounds1.CenterPoint());
+ window_selector()->InitiateDrag(selector_item1, start_location1);
+ const gfx::Point end_location1(0, 0);
+ window_selector()->Drag(selector_item1, end_location1);
+ window_selector()->CompleteDrag(selector_item1);
+
+ EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), true);
+ EXPECT_EQ(split_view_controller()->state(),
+ SplitViewController::LEFT_SNAPPED);
+ EXPECT_EQ(split_view_controller()->left_window(), window1.get());
+
+ // Drag |window2| selector item to snap to left.
+ WindowSelectorItem* selector_item2 =
+ GetWindowItemForWindow(grid_index, window2.get());
+ const gfx::Rect selector_item_bounds2 = selector_item2->target_bounds();
+ // Start drag in the middle of the seletor item.
+ const gfx::Point start_location2(selector_item_bounds2.CenterPoint());
+ window_selector()->InitiateDrag(selector_item2, start_location2);
+ const gfx::Point end_location2(0, 0);
+ window_selector()->Drag(selector_item2, end_location2);
+ window_selector()->CompleteDrag(selector_item2);
+
+ EXPECT_EQ(split_view_controller()->state(),
+ SplitViewController::LEFT_SNAPPED);
+ EXPECT_EQ(split_view_controller()->left_window(), window2.get());
+
+ // Drag |window3| selector item to snap to right.
+ WindowSelectorItem* selector_item3 =
+ GetWindowItemForWindow(grid_index, window3.get());
+ const gfx::Rect selector_item_bounds3 = selector_item3->target_bounds();
+ // Start drag in the middle of the seletor item.
+ const gfx::Point start_location3(selector_item_bounds3.CenterPoint());
+ window_selector()->InitiateDrag(selector_item3, start_location3);
+ const gfx::Rect work_area_rect =
+ split_view_controller()->GetDisplayWorkAreaBoundsInScreen(window2.get());
+ const gfx::Point end_location3(work_area_rect.width(), 0);
+ window_selector()->Drag(selector_item3, end_location3);
+ window_selector()->CompleteDrag(selector_item3);
+
+ EXPECT_EQ(split_view_controller()->state(),
+ SplitViewController::BOTH_SNAPPED);
+ EXPECT_EQ(split_view_controller()->right_window(), window3.get());
+ EXPECT_FALSE(window_selector_controller()->IsSelecting());
+}
+
} // namespace ash
« no previous file with comments | « ash/wm/overview/window_selector_item.cc ('k') | ash/wm/splitview/split_view_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698