OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/lock_window_state.h" | 5 #include "ash/common/wm/lock_window_state.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/wm/lock_layout_manager.h" | 9 #include "ash/common/wm/lock_layout_manager.h" |
10 #include "ash/common/wm/window_animation_types.h" | 10 #include "ash/common/wm/window_animation_types.h" |
11 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
12 #include "ash/common/wm/window_state_delegate.h" | 12 #include "ash/common/wm/window_state_delegate.h" |
13 #include "ash/common/wm/window_state_util.h" | 13 #include "ash/common/wm/window_state_util.h" |
14 #include "ash/common/wm/wm_event.h" | 14 #include "ash/common/wm/wm_event.h" |
15 #include "ash/common/wm/wm_screen_util.h" | 15 #include "ash/common/wm/wm_screen_util.h" |
16 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
17 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
| 18 #include "base/memory/ptr_util.h" |
18 #include "ui/gfx/geometry/rect.h" | 19 #include "ui/gfx/geometry/rect.h" |
19 #include "ui/keyboard/keyboard_controller.h" | 20 #include "ui/keyboard/keyboard_controller.h" |
20 #include "ui/keyboard/keyboard_util.h" | 21 #include "ui/keyboard/keyboard_util.h" |
21 | 22 |
22 namespace ash { | 23 namespace ash { |
23 | 24 |
24 LockWindowState::LockWindowState(WmWindow* window) | 25 LockWindowState::LockWindowState(WmWindow* window) |
25 : current_state_type_(window->GetWindowState()->GetStateType()) {} | 26 : current_state_type_(window->GetWindowState()->GetStateType()) {} |
26 | 27 |
27 LockWindowState::~LockWindowState() {} | 28 LockWindowState::~LockWindowState() {} |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); | 175 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); |
175 } | 176 } |
176 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); | 177 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); |
177 bounds.set_height(bounds.height() - keyboard_bounds.height()); | 178 bounds.set_height(bounds.height() - keyboard_bounds.height()); |
178 | 179 |
179 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); | 180 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); |
180 window_state->SetBoundsDirect(bounds); | 181 window_state->SetBoundsDirect(bounds); |
181 } | 182 } |
182 | 183 |
183 } // namespace ash | 184 } // namespace ash |
OLD | NEW |