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

Side by Side Diff: ash/wm/stacking_controller_unittest.cc

Issue 36473003: Rename StackingClient -> WindowTreeClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: done. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/shell_window_ids.h" 6 #include "ash/shell_window_ids.h"
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/wm/window_properties.h" 8 #include "ash/wm/window_properties.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 kShellWindowId_ShelfContainer); 43 kShellWindowId_ShelfContainer);
44 launcher->AddChild(w2.get()); 44 launcher->AddChild(w2.get());
45 w2->Show(); 45 w2->Show();
46 46
47 wm::ActivateWindow(w2.get()); 47 wm::ActivateWindow(w2.get());
48 48
49 // Window with a transient parent. 49 // Window with a transient parent.
50 scoped_ptr<Window> w1(CreateTestWindow()); 50 scoped_ptr<Window> w1(CreateTestWindow());
51 w2->AddTransientChild(w1.get()); 51 w2->AddTransientChild(w1.get());
52 w1->SetBounds(gfx::Rect(10, 11, 250, 251)); 52 w1->SetBounds(gfx::Rect(10, 11, 250, 251));
53 SetDefaultParentByPrimaryRootWindow(w1.get()); 53 ParentWindowInPrimaryRootWindow(w1.get());
54 w1->Show(); 54 w1->Show();
55 wm::ActivateWindow(w1.get()); 55 wm::ActivateWindow(w1.get());
56 56
57 // The window with the transient parent should get added to the same container 57 // The window with the transient parent should get added to the same container
58 // as its transient parent. 58 // as its transient parent.
59 EXPECT_EQ(launcher, w1->parent()); 59 EXPECT_EQ(launcher, w1->parent());
60 } 60 }
61 61
62 } // namespace internal 62 } // namespace internal
63 } // namespace ash 63 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698