| 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/wm/lock_window_state.h" | 5 #include "ash/wm/lock_window_state.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
| 10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/wm/aura/wm_window_aura.h" | 12 #include "ash/wm/aura/wm_window_aura.h" |
| 13 #include "ash/wm/common/window_animation_types.h" | 13 #include "ash/wm/common/window_animation_types.h" |
| 14 #include "ash/wm/common/window_state.h" |
| 15 #include "ash/wm/common/window_state_delegate.h" |
| 14 #include "ash/wm/common/window_state_util.h" | 16 #include "ash/wm/common/window_state_util.h" |
| 15 #include "ash/wm/common/wm_event.h" | 17 #include "ash/wm/common/wm_event.h" |
| 16 #include "ash/wm/lock_layout_manager.h" | 18 #include "ash/wm/lock_layout_manager.h" |
| 17 #include "ash/wm/window_animations.h" | 19 #include "ash/wm/window_animations.h" |
| 18 #include "ash/wm/window_state.h" | |
| 19 #include "ash/wm/window_state_aura.h" | 20 #include "ash/wm/window_state_aura.h" |
| 20 #include "ash/wm/window_state_delegate.h" | |
| 21 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
| 22 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
| 23 #include "ui/aura/window_delegate.h" | 23 #include "ui/aura/window_delegate.h" |
| 24 #include "ui/gfx/geometry/rect.h" | 24 #include "ui/gfx/geometry/rect.h" |
| 25 #include "ui/keyboard/keyboard_controller.h" | 25 #include "ui/keyboard/keyboard_controller.h" |
| 26 #include "ui/keyboard/keyboard_util.h" | 26 #include "ui/keyboard/keyboard_util.h" |
| 27 #include "ui/wm/core/window_animations.h" | 27 #include "ui/wm/core/window_animations.h" |
| 28 | 28 |
| 29 namespace ash { | 29 namespace ash { |
| 30 | 30 |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot( | 199 gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot( |
| 200 ash::wm::WmWindowAura::GetAuraWindow(window_state->window())); | 200 ash::wm::WmWindowAura::GetAuraWindow(window_state->window())); |
| 201 | 201 |
| 202 bounds.set_height(bounds.height() - keyboard_bounds.height()); | 202 bounds.set_height(bounds.height() - keyboard_bounds.height()); |
| 203 | 203 |
| 204 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); | 204 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); |
| 205 window_state->SetBoundsDirect(bounds); | 205 window_state->SetBoundsDirect(bounds); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace ash | 208 } // namespace ash |
| OLD | NEW |