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

Unified Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 597683003: Add window states docked; and docked minimized. Add wm window event to set docked and undocked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dock
Patch Set: Pull forward a change from the dependant CL to this Created 6 years, 2 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/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index a8054a39b9a768f44632e40e1b16ddc5e866765f..16134a3431b2e2638ba20d730b3221fa95344e15 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -710,8 +710,11 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsMinimize) {
// The first window should get minimized but parented by the dock container.
EXPECT_TRUE(wm::GetWindowState(w1.get())->IsMinimized());
- EXPECT_TRUE(wm::GetWindowState(w2.get())->IsNormalStateType());
- EXPECT_TRUE(wm::GetWindowState(w3.get())->IsNormalStateType());
+ EXPECT_TRUE(wm::GetWindowState(w1.get())->IsDocked());
+ EXPECT_FALSE(wm::GetWindowState(w2.get())->IsMinimized());
+ EXPECT_TRUE(wm::GetWindowState(w2.get())->IsDocked());
+ EXPECT_FALSE(wm::GetWindowState(w3.get())->IsMinimized());
+ EXPECT_TRUE(wm::GetWindowState(w3.get())->IsDocked());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
}
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698