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/workspace/workspace_layout_manager.h" | 5 #include "ash/wm/workspace/workspace_layout_manager.h" |
6 | 6 |
7 #include "ash/display/display_layout.h" | 7 #include "ash/display/display_layout.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
11 #include "ash/session_state_delegate.h" | 11 #include "ash/session_state_delegate.h" |
12 #include "ash/shelf/shelf_layout_manager.h" | 12 #include "ash/shelf/shelf_layout_manager.h" |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "ash/shell_observer.h" | 14 #include "ash/shell_observer.h" |
15 #include "ash/shell_window_ids.h" | 15 #include "ash/shell_window_ids.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/wm/window_state.h" | 17 #include "ash/wm/window_state.h" |
18 #include "ash/wm/window_util.h" | 18 #include "ash/wm/window_util.h" |
19 #include "ash/wm/workspace/workspace_window_resizer.h" | 19 #include "ash/wm/workspace/workspace_window_resizer.h" |
20 #include "base/basictypes.h" | 20 #include "base/basictypes.h" |
21 #include "base/compiler_specific.h" | 21 #include "base/compiler_specific.h" |
22 #include "ui/aura/client/aura_constants.h" | 22 #include "ui/aura/client/aura_constants.h" |
23 #include "ui/aura/root_window.h" | |
24 #include "ui/aura/test/test_windows.h" | 23 #include "ui/aura/test/test_windows.h" |
25 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
| 25 #include "ui/aura/window_event_dispatcher.h" |
26 #include "ui/base/ui_base_types.h" | 26 #include "ui/base/ui_base_types.h" |
27 #include "ui/gfx/insets.h" | 27 #include "ui/gfx/insets.h" |
28 #include "ui/gfx/screen.h" | 28 #include "ui/gfx/screen.h" |
29 #include "ui/views/corewm/window_util.h" | 29 #include "ui/views/corewm/window_util.h" |
30 #include "ui/views/widget/widget.h" | 30 #include "ui/views/widget/widget.h" |
31 #include "ui/views/widget/widget_delegate.h" | 31 #include "ui/views/widget/widget_delegate.h" |
32 | 32 |
33 namespace ash { | 33 namespace ash { |
34 namespace { | 34 namespace { |
35 | 35 |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
784 EXPECT_NE( | 784 EXPECT_NE( |
785 ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), | 785 ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), |
786 window_bounds.ToString()); | 786 window_bounds.ToString()); |
787 | 787 |
788 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 788 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
789 shelf->UpdateVisibilityState(); | 789 shelf->UpdateVisibilityState(); |
790 EXPECT_EQ(window_bounds.ToString(), window->bounds().ToString()); | 790 EXPECT_EQ(window_bounds.ToString(), window->bounds().ToString()); |
791 } | 791 } |
792 | 792 |
793 } // namespace ash | 793 } // namespace ash |
OLD | NEW |