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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
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/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/wm/lock_layout_manager.h" 9 #include "ash/wm/lock_layout_manager.h"
10 #include "ash/wm/window_animation_types.h" 10 #include "ash/wm/window_animation_types.h"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "ash/wm/window_state_delegate.h" 12 #include "ash/wm/window_state_delegate.h"
13 #include "ash/wm/window_state_util.h" 13 #include "ash/wm/window_state_util.h"
14 #include "ash/wm/wm_event.h" 14 #include "ash/wm/wm_event.h"
15 #include "ash/wm/wm_screen_util.h" 15 #include "ash/wm/wm_screen_util.h"
16 #include "ash/wm_shell.h"
17 #include "ash/wm_window.h" 16 #include "ash/wm_window.h"
18 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
19 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
20 #include "ui/keyboard/keyboard_controller.h" 19 #include "ui/keyboard/keyboard_controller.h"
21 #include "ui/keyboard/keyboard_util.h" 20 #include "ui/keyboard/keyboard_util.h"
22 21
23 namespace ash { 22 namespace ash {
24 23
25 LockWindowState::LockWindowState(WmWindow* window) 24 LockWindowState::LockWindowState(WmWindow* window)
26 : current_state_type_(window->GetWindowState()->GetStateType()) {} 25 : current_state_type_(window->GetWindowState()->GetStateType()) {}
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); 173 keyboard_bounds = keyboard_controller->current_keyboard_bounds();
175 } 174 }
176 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); 175 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window());
177 bounds.set_height(bounds.height() - keyboard_bounds.height()); 176 bounds.set_height(bounds.height() - keyboard_bounds.height());
178 177
179 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); 178 VLOG(1) << "Updating window bounds to: " << bounds.ToString();
180 window_state->SetBoundsDirect(bounds); 179 window_state->SetBoundsDirect(bounds);
181 } 180 }
182 181
183 } // namespace ash 182 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698