| OLD | NEW |
| 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/wm/system_modal_container_layout_manager.h" | 5 #include "ash/wm/system_modal_container_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/session_state_delegate.h" | 8 #include "ash/session_state_delegate.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| 11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/wm/window_util.h" | 12 #include "ash/wm/window_util.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
| 15 #include "ui/aura/test/event_generator.h" | 15 #include "ui/aura/test/event_generator.h" |
| 16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 17 #include "ui/aura/window_event_dispatcher.h" | 17 #include "ui/aura/window_event_dispatcher.h" |
| 18 #include "ui/compositor/layer.h" | 18 #include "ui/compositor/layer.h" |
| 19 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
| 20 #include "ui/views/corewm/window_util.h" | |
| 21 #include "ui/views/test/capture_tracking_view.h" | 20 #include "ui/views/test/capture_tracking_view.h" |
| 22 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 23 #include "ui/views/widget/widget_delegate.h" | 22 #include "ui/views/widget/widget_delegate.h" |
| 23 #include "ui/wm/core/window_util.h" |
| 24 | 24 |
| 25 namespace ash { | 25 namespace ash { |
| 26 namespace test { | 26 namespace test { |
| 27 | 27 |
| 28 namespace { | 28 namespace { |
| 29 | 29 |
| 30 aura::Window* GetModalContainer() { | 30 aura::Window* GetModalContainer() { |
| 31 return Shell::GetPrimaryRootWindowController()->GetContainer( | 31 return Shell::GetPrimaryRootWindowController()->GetContainer( |
| 32 ash::internal::kShellWindowId_SystemModalContainer); | 32 ash::internal::kShellWindowId_SystemModalContainer); |
| 33 } | 33 } |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 | 487 |
| 488 // No more modal screen. | 488 // No more modal screen. |
| 489 modal1->Hide(); | 489 modal1->Hide(); |
| 490 TestWindow::CloseTestWindow(modal1.release()); | 490 TestWindow::CloseTestWindow(modal1.release()); |
| 491 EXPECT_FALSE(AllRootWindowsHaveModalBackgrounds()); | 491 EXPECT_FALSE(AllRootWindowsHaveModalBackgrounds()); |
| 492 EXPECT_TRUE(wm::IsActiveWindow(normal.get())); | 492 EXPECT_TRUE(wm::IsActiveWindow(normal.get())); |
| 493 } | 493 } |
| 494 | 494 |
| 495 } // namespace test | 495 } // namespace test |
| 496 } // namespace ash | 496 } // namespace ash |
| OLD | NEW |