Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: ash/wm/lock_window_state.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/lock_window_state.h ('k') | ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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/wm/lock_layout_manager.h"
10 #include "ash/common/wm/window_animation_types.h" 10 #include "ash/wm/window_animation_types.h"
11 #include "ash/common/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "ash/common/wm/window_state_delegate.h" 12 #include "ash/wm/window_state_delegate.h"
13 #include "ash/common/wm/window_state_util.h" 13 #include "ash/wm/window_state_util.h"
14 #include "ash/common/wm/wm_event.h" 14 #include "ash/wm/wm_event.h"
15 #include "ash/common/wm/wm_screen_util.h" 15 #include "ash/wm/wm_screen_util.h"
16 #include "ash/common/wm_shell.h" 16 #include "ash/wm_shell.h"
17 #include "ash/common/wm_window.h" 17 #include "ash/wm_window.h"
18 #include "base/memory/ptr_util.h" 18 #include "base/memory/ptr_util.h"
19 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
20 #include "ui/keyboard/keyboard_controller.h" 20 #include "ui/keyboard/keyboard_controller.h"
21 #include "ui/keyboard/keyboard_util.h" 21 #include "ui/keyboard/keyboard_util.h"
22 22
23 namespace ash { 23 namespace ash {
24 24
25 LockWindowState::LockWindowState(WmWindow* window) 25 LockWindowState::LockWindowState(WmWindow* window)
26 : current_state_type_(window->GetWindowState()->GetStateType()) {} 26 : current_state_type_(window->GetWindowState()->GetStateType()) {}
27 27
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); 175 keyboard_bounds = keyboard_controller->current_keyboard_bounds();
176 } 176 }
177 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); 177 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window());
178 bounds.set_height(bounds.height() - keyboard_bounds.height()); 178 bounds.set_height(bounds.height() - keyboard_bounds.height());
179 179
180 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); 180 VLOG(1) << "Updating window bounds to: " << bounds.ToString();
181 window_state->SetBoundsDirect(bounds); 181 window_state->SetBoundsDirect(bounds);
182 } 182 }
183 183
184 } // namespace ash 184 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_window_state.h ('k') | ash/wm/maximize_mode/maximize_mode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698