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

Unified Diff: ash/common/shelf/shelf_window_watcher_unittest.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase and fix 1 test 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/common/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/common/shelf/shelf_window_watcher_unittest.cc b/ash/common/shelf/shelf_window_watcher_unittest.cc
index d50c8579f96a42def55dbe4ad06f240d2a28744e..29b5de7fd92349930ec8810a4a87f3998b0c8964 100644
--- a/ash/common/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/common/shelf/shelf_window_watcher_unittest.cc
@@ -223,14 +223,6 @@ TEST_F(ShelfWindowWatcherTest, DockWindow) {
root_window->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
EXPECT_EQ(default_container, window->GetParent());
- WmWindow* docked_container =
- root_window->GetChildByShellWindowId(kShellWindowId_DockedContainer);
-
- // Check |window|'s item is not removed when it is re-parented to the dock.
- docked_container->AddChild(window);
- EXPECT_EQ(docked_container, window->GetParent());
- EXPECT_EQ(2, model_->item_count());
-
// The shelf item is removed when the window is closed, even if it is in the
// docked container at the time.
widget.reset();

Powered by Google App Engine
This is Rietveld 408576698