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

Unified Diff: ash/wm/stacking_controller_unittest.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: safer shutdown (status_area_widget_) Created 7 years, 9 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/shelf_layout_manager_unittest.cc ('k') | ash/wm/status_area_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller_unittest.cc
diff --git a/ash/wm/stacking_controller_unittest.cc b/ash/wm/stacking_controller_unittest.cc
index bf4d1fd855d68e6c5a412ae40c4060ad1b90cbf7..6f5d1f8bdd6ae30b8580802117edf332a54933ba 100644
--- a/ash/wm/stacking_controller_unittest.cc
+++ b/ash/wm/stacking_controller_unittest.cc
@@ -41,7 +41,7 @@ TEST_F(StackingControllerTest, TransientParent) {
scoped_ptr<Window> w2(CreateTestWindow());
w2->SetBounds(gfx::Rect(10, 11, 250, 251));
aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
- kShellWindowId_LauncherContainer);
+ kShellWindowId_ShelfContainer);
launcher->AddChild(w2.get());
w2->Show();
« no previous file with comments | « ash/wm/shelf_layout_manager_unittest.cc ('k') | ash/wm/status_area_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698