| 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/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/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
| 16 #include "ui/aura/test/event_generator.h" | 16 #include "ui/aura/test/event_generator.h" |
| 17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
| 18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 | 569 |
| 570 // After the keyboard is gone, the window will remain where it was. | 570 // After the keyboard is gone, the window will remain where it was. |
| 571 ShowKeyboard(false); | 571 ShowKeyboard(false); |
| 572 EXPECT_NE(modal_bounds.ToString(), modal_window->bounds().ToString()); | 572 EXPECT_NE(modal_bounds.ToString(), modal_window->bounds().ToString()); |
| 573 EXPECT_EQ(modal_size.ToString(), modal_window->bounds().size().ToString()); | 573 EXPECT_EQ(modal_size.ToString(), modal_window->bounds().size().ToString()); |
| 574 EXPECT_EQ(modal_origin.x(), modal_window->bounds().x()); | 574 EXPECT_EQ(modal_origin.x(), modal_window->bounds().x()); |
| 575 } | 575 } |
| 576 | 576 |
| 577 } // namespace test | 577 } // namespace test |
| 578 } // namespace ash | 578 } // namespace ash |
| OLD | NEW |