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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/status_area_layout_manager.h » ('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/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/wm/core/window_util.h" 13 #include "ui/wm/core/window_util.h"
14 14
15 using aura::Window; 15 using aura::Window;
16 16
17 namespace ash { 17 namespace ash {
18 namespace internal {
19 18
20 class StackingControllerTest : public test::AshTestBase { 19 class StackingControllerTest : public test::AshTestBase {
21 public: 20 public:
22 StackingControllerTest() {} 21 StackingControllerTest() {}
23 virtual ~StackingControllerTest() {} 22 virtual ~StackingControllerTest() {}
24 23
25 aura::Window* CreateTestWindow() { 24 aura::Window* CreateTestWindow() {
26 aura::Window* window = new aura::Window(NULL); 25 aura::Window* window = new aura::Window(NULL);
27 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); 26 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
28 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); 27 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
(...skipping 24 matching lines...) Expand all
53 w1->SetBounds(gfx::Rect(10, 11, 250, 251)); 52 w1->SetBounds(gfx::Rect(10, 11, 250, 251));
54 ParentWindowInPrimaryRootWindow(w1.get()); 53 ParentWindowInPrimaryRootWindow(w1.get());
55 w1->Show(); 54 w1->Show();
56 wm::ActivateWindow(w1.get()); 55 wm::ActivateWindow(w1.get());
57 56
58 // 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
59 // as its transient parent. 58 // as its transient parent.
60 EXPECT_EQ(launcher, w1->parent()); 59 EXPECT_EQ(launcher, w1->parent());
61 } 60 }
62 61
63 } // namespace internal
64 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/status_area_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698