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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 10 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
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index da79c367a2e584a086cb06a23b6f8a4d93955bf9..7a31d61572274c73b59e2ad2d41f4ee6e0f99225 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -2670,32 +2670,6 @@ TEST_F(DisplayManagerTest, NoRotateUnifiedDesktop) {
EXPECT_EQ("400x500", screen->GetPrimaryDisplay().size().ToString());
}
-// Makes sure the transition from unified to single won't crash
-// with docked windows.
-TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
- // Enable window docking for this test.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- ash::switches::kAshEnableDockedWindows);
-
- display_manager()->SetUnifiedDesktopEnabled(true);
-
- // Don't check root window destruction in unified mode.
- Shell::GetPrimaryRootWindow()->RemoveObserver(this);
-
- UpdateDisplay("400x500,300x200");
-
- std::unique_ptr<aura::Window> docked(
- CreateTestWindowInShellWithBounds(gfx::Rect(10, 10, 50, 50)));
- docked->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
- ASSERT_TRUE(wm::GetWindowState(docked.get())->IsDocked());
- // 48 pixels reserved for launcher shelf height.
- EXPECT_EQ(gfx::Rect(0, 0, 250, 452).ToString(), docked->bounds().ToString());
- UpdateDisplay("300x300");
- // Make sure the window is still docked.
- EXPECT_TRUE(wm::GetWindowState(docked.get())->IsDocked());
- EXPECT_EQ(gfx::Rect(0, 0, 250, 252).ToString(), docked->bounds().ToString());
-}
-
TEST_F(DisplayManagerTest, DockMode) {
const int64_t internal_id = 1;
const int64_t external_id = 2;

Powered by Google App Engine
This is Rietveld 408576698