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

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

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded parens Created 6 years, 11 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
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "ui/aura/root_window.h" 11 #include "ui/aura/root_window.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/views/corewm/window_util.h"
13 14
14 using aura::Window; 15 using aura::Window;
15 16
16 namespace ash { 17 namespace ash {
17 namespace internal { 18 namespace internal {
18 19
19 class StackingControllerTest : public test::AshTestBase { 20 class StackingControllerTest : public test::AshTestBase {
20 public: 21 public:
21 StackingControllerTest() {} 22 StackingControllerTest() {}
22 virtual ~StackingControllerTest() {} 23 virtual ~StackingControllerTest() {}
(...skipping 18 matching lines...) Expand all
41 w2->SetBounds(gfx::Rect(10, 11, 250, 251)); 42 w2->SetBounds(gfx::Rect(10, 11, 250, 251));
42 aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(), 43 aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
43 kShellWindowId_ShelfContainer); 44 kShellWindowId_ShelfContainer);
44 launcher->AddChild(w2.get()); 45 launcher->AddChild(w2.get());
45 w2->Show(); 46 w2->Show();
46 47
47 wm::ActivateWindow(w2.get()); 48 wm::ActivateWindow(w2.get());
48 49
49 // Window with a transient parent. 50 // Window with a transient parent.
50 scoped_ptr<Window> w1(CreateTestWindow()); 51 scoped_ptr<Window> w1(CreateTestWindow());
51 w2->AddTransientChild(w1.get()); 52 views::corewm::AddTransientChild(w2.get(), w1.get());
52 w1->SetBounds(gfx::Rect(10, 11, 250, 251)); 53 w1->SetBounds(gfx::Rect(10, 11, 250, 251));
53 ParentWindowInPrimaryRootWindow(w1.get()); 54 ParentWindowInPrimaryRootWindow(w1.get());
54 w1->Show(); 55 w1->Show();
55 wm::ActivateWindow(w1.get()); 56 wm::ActivateWindow(w1.get());
56 57
57 // The window with the transient parent should get added to the same container 58 // The window with the transient parent should get added to the same container
58 // as its transient parent. 59 // as its transient parent.
59 EXPECT_EQ(launcher, w1->parent()); 60 EXPECT_EQ(launcher, w1->parent());
60 } 61 }
61 62
62 } // namespace internal 63 } // namespace internal
63 } // namespace ash 64 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698