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/common/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/aura/wm_window_aura.h" | 10 #include "ash/aura/wm_window_aura.h" |
| 11 #include "ash/common/session/session_state_delegate.h" |
11 #include "ash/common/shell_window_ids.h" | 12 #include "ash/common/shell_window_ids.h" |
12 #include "ash/common/wm/window_state.h" | 13 #include "ash/common/wm/window_state.h" |
13 #include "ash/common/wm/wm_event.h" | 14 #include "ash/common/wm/wm_event.h" |
14 #include "ash/common/wm/workspace/workspace_window_resizer.h" | 15 #include "ash/common/wm/workspace/workspace_window_resizer.h" |
15 #include "ash/display/display_manager.h" | 16 #include "ash/display/display_manager.h" |
16 #include "ash/root_window_controller.h" | 17 #include "ash/root_window_controller.h" |
17 #include "ash/screen_util.h" | 18 #include "ash/screen_util.h" |
18 #include "ash/session/session_state_delegate.h" | |
19 #include "ash/shelf/shelf.h" | 19 #include "ash/shelf/shelf.h" |
20 #include "ash/shelf/shelf_layout_manager.h" | 20 #include "ash/shelf/shelf_layout_manager.h" |
21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
22 #include "ash/shell_observer.h" | 22 #include "ash/shell_observer.h" |
23 #include "ash/test/ash_test_base.h" | 23 #include "ash/test/ash_test_base.h" |
24 #include "ash/test/display_manager_test_api.h" | 24 #include "ash/test/display_manager_test_api.h" |
25 #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" | 25 #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" |
26 #include "ash/wm/window_state_aura.h" | 26 #include "ash/wm/window_state_aura.h" |
27 #include "ash/wm/window_util.h" | 27 #include "ash/wm/window_util.h" |
28 #include "base/compiler_specific.h" | 28 #include "base/compiler_specific.h" |
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1152 EXPECT_EQ(gfx::Rect(50, | 1152 EXPECT_EQ(gfx::Rect(50, |
1153 keyboard_bounds.y() - keyboard_bounds.height()/2, | 1153 keyboard_bounds.y() - keyboard_bounds.height()/2, |
1154 occluded_window_bounds.width(), | 1154 occluded_window_bounds.width(), |
1155 occluded_window_bounds.height()).ToString(), | 1155 occluded_window_bounds.height()).ToString(), |
1156 window->bounds().ToString()); | 1156 window->bounds().ToString()); |
1157 HideKeyboard(); | 1157 HideKeyboard(); |
1158 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); | 1158 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); |
1159 } | 1159 } |
1160 | 1160 |
1161 } // namespace ash | 1161 } // namespace ash |
OLD | NEW |