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

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

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 12 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/wm/modal_container_layout_manager.h" 5 #include "ash/wm/modal_container_layout_manager.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/test/aura_shell_test_base.h" 9 #include "ash/test/aura_shell_test_base.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
13 #include "ui/aura/test/event_generator.h" 13 #include "ui/aura/test/event_generator.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 #include "ui/views/widget/widget_delegate.h" 16 #include "ui/views/widget/widget_delegate.h"
17 17
18 namespace aura_shell { 18 namespace ash {
19 namespace test { 19 namespace test {
20 20
21 namespace { 21 namespace {
22 22
23 aura::Window* GetModalContainer() { 23 aura::Window* GetModalContainer() {
24 return Shell::GetInstance()->GetContainer( 24 return Shell::GetInstance()->GetContainer(
25 aura_shell::internal::kShellWindowId_ModalContainer); 25 ash::internal::kShellWindowId_ModalContainer);
26 } 26 }
27 27
28 aura::Window* GetDefaultContainer() { 28 aura::Window* GetDefaultContainer() {
29 return Shell::GetInstance()->GetContainer( 29 return Shell::GetInstance()->GetContainer(
30 aura_shell::internal::kShellWindowId_DefaultContainer); 30 ash::internal::kShellWindowId_DefaultContainer);
31 } 31 }
32 32
33 class TestWindow : public views::WidgetDelegateView { 33 class TestWindow : public views::WidgetDelegateView {
34 public: 34 public:
35 explicit TestWindow(bool modal) : modal_(modal) {} 35 explicit TestWindow(bool modal) : modal_(modal) {}
36 virtual ~TestWindow() {} 36 virtual ~TestWindow() {}
37 37
38 static aura::Window* OpenTestWindow(aura::Window* parent, bool modal) { 38 static aura::Window* OpenTestWindow(aura::Window* parent, bool modal) {
39 DCHECK(!modal || (modal && parent)); 39 DCHECK(!modal || (modal && parent));
40 views::Widget* widget = 40 views::Widget* widget =
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // parent should now be active again. 164 // parent should now be active again.
165 EXPECT_TRUE(IsActiveWindow(parent.get())); 165 EXPECT_TRUE(IsActiveWindow(parent.get()));
166 166
167 // Attempting to click unrelated should activate it. 167 // Attempting to click unrelated should activate it.
168 aura::test::EventGenerator e2(unrelated.get()); 168 aura::test::EventGenerator e2(unrelated.get());
169 e2.ClickLeftButton(); 169 e2.ClickLeftButton();
170 EXPECT_TRUE(IsActiveWindow(unrelated.get())); 170 EXPECT_TRUE(IsActiveWindow(unrelated.get()));
171 } 171 }
172 172
173 } // namespace test 173 } // namespace test
174 } // namespace aura_shell 174 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698