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

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

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to master 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
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 #include "ui/views/corewm/window_util.h"
14 14
15 using aura::Window; 15 using aura::Window;
16 16
17 namespace ash { 17 namespace ash {
18 namespace internal { 18 namespace internal {
19 19
20 class StackingControllerTest : public test::AshTestBase { 20 class StackingControllerTest : public test::AshTestBase {
21 public: 21 public:
22 StackingControllerTest() {} 22 StackingControllerTest() {}
23 virtual ~StackingControllerTest() {} 23 virtual ~StackingControllerTest() {}
24 24
25 aura::Window* CreateTestWindow() { 25 aura::Window* CreateTestWindow() {
26 aura::Window* window = new aura::Window(NULL); 26 aura::Window* window = new aura::Window(NULL);
27 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); 27 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
28 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); 28 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
29 window->Init(ui::LAYER_TEXTURED); 29 window->Init(aura::WINDOW_LAYER_TEXTURED);
30 return window; 30 return window;
31 } 31 }
32 32
33 private: 33 private:
34 DISALLOW_COPY_AND_ASSIGN(StackingControllerTest); 34 DISALLOW_COPY_AND_ASSIGN(StackingControllerTest);
35 }; 35 };
36 36
37 // Verifies a window with a transient parent is in the same container as its 37 // Verifies a window with a transient parent is in the same container as its
38 // transient parent. 38 // transient parent.
39 TEST_F(StackingControllerTest, TransientParent) { 39 TEST_F(StackingControllerTest, TransientParent) {
(...skipping 15 matching lines...) Expand all
55 w1->Show(); 55 w1->Show();
56 wm::ActivateWindow(w1.get()); 56 wm::ActivateWindow(w1.get());
57 57
58 // 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
59 // as its transient parent. 59 // as its transient parent.
60 EXPECT_EQ(launcher, w1->parent()); 60 EXPECT_EQ(launcher, w1->parent());
61 } 61 }
62 62
63 } // namespace internal 63 } // namespace internal
64 } // namespace ash 64 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/solo_window_tracker_unittest.cc ('k') | ash/wm/toplevel_window_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698