| 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 <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/public/cpp/config.h" | 10 #include "ash/public/cpp/config.h" |
| 11 #include "ash/public/cpp/shell_window_ids.h" | 11 #include "ash/public/cpp/shell_window_ids.h" |
| 12 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
| 13 #include "ash/screen_util.h" | 13 #include "ash/screen_util.h" |
| 14 #include "ash/session/session_controller.h" | 14 #include "ash/session/session_controller.h" |
| 15 #include "ash/shelf/shelf_constants.h" | 15 #include "ash/shelf/shelf_constants.h" |
| 16 #include "ash/shelf/shelf_layout_manager.h" | 16 #include "ash/shelf/shelf_layout_manager.h" |
| 17 #include "ash/shelf/wm_shelf.h" | 17 #include "ash/shelf/wm_shelf.h" |
| 18 #include "ash/shell.h" | 18 #include "ash/shell.h" |
| 19 #include "ash/shell_observer.h" | 19 #include "ash/shell_observer.h" |
| 20 #include "ash/shell_port.h" | 20 #include "ash/shell_port.h" |
| 21 #include "ash/test/ash_test_base.h" | 21 #include "ash/test/ash_test_base.h" |
| 22 #include "ash/test/test_session_controller_client.h" | 22 #include "ash/test/test_session_controller_client.h" |
| 23 #include "ash/test/wm_window_test_api.h" | 23 #include "ash/test/wm_window_test_api.h" |
| 24 #include "ash/wm/fullscreen_window_finder.h" | 24 #include "ash/wm/fullscreen_window_finder.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.h" | 26 #include "ash/wm/window_state.h" |
| 27 #include "ash/wm/window_state_aura.h" | 27 #include "ash/wm/window_state_aura.h" |
| 28 #include "ash/wm/window_util.h" | 28 #include "ash/wm/window_util.h" |
| 29 #include "ash/wm/wm_event.h" | 29 #include "ash/wm/wm_event.h" |
| 30 #include "ash/wm/wm_screen_util.h" | |
| 31 #include "ash/wm/workspace/workspace_window_resizer.h" | 30 #include "ash/wm/workspace/workspace_window_resizer.h" |
| 32 #include "ash/wm_window.h" | 31 #include "ash/wm_window.h" |
| 33 #include "base/command_line.h" | 32 #include "base/command_line.h" |
| 34 #include "base/run_loop.h" | 33 #include "base/run_loop.h" |
| 35 #include "ui/aura/client/aura_constants.h" | 34 #include "ui/aura/client/aura_constants.h" |
| 36 #include "ui/aura/client/focus_client.h" | 35 #include "ui/aura/client/focus_client.h" |
| 37 #include "ui/aura/window.h" | 36 #include "ui/aura/window.h" |
| 38 #include "ui/base/ui_base_switches.h" | 37 #include "ui/base/ui_base_switches.h" |
| 39 #include "ui/base/ui_base_types.h" | 38 #include "ui/base/ui_base_types.h" |
| 40 #include "ui/compositor/layer_type.h" | 39 #include "ui/compositor/layer_type.h" |
| (...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 window->SetBounds(keyboard_bounds()); | 1270 window->SetBounds(keyboard_bounds()); |
| 1272 wm::GetWindowState(window.get())->set_ignore_keyboard_bounds_change(true); | 1271 wm::GetWindowState(window.get())->set_ignore_keyboard_bounds_change(true); |
| 1273 wm::ActivateWindow(window.get()); | 1272 wm::ActivateWindow(window.get()); |
| 1274 | 1273 |
| 1275 EXPECT_EQ(keyboard_bounds(), window->bounds()); | 1274 EXPECT_EQ(keyboard_bounds(), window->bounds()); |
| 1276 ShowKeyboard(); | 1275 ShowKeyboard(); |
| 1277 EXPECT_EQ(keyboard_bounds(), window->bounds()); | 1276 EXPECT_EQ(keyboard_bounds(), window->bounds()); |
| 1278 } | 1277 } |
| 1279 | 1278 |
| 1280 } // namespace ash | 1279 } // namespace ash |
| OLD | NEW |