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/default_window_resizer.h" | 5 #include "ash/wm/default_window_resizer.h" |
6 | 6 |
| 7 #include "ash/shell_port.h" |
7 #include "ash/wm/window_state.h" | 8 #include "ash/wm/window_state.h" |
8 #include "ash/wm_shell.h" | |
9 #include "ash/wm_window.h" | 9 #include "ash/wm_window.h" |
10 | 10 |
11 namespace ash { | 11 namespace ash { |
12 | 12 |
13 DefaultWindowResizer::~DefaultWindowResizer() { | 13 DefaultWindowResizer::~DefaultWindowResizer() { |
14 shell_->UnlockCursor(); | 14 ShellPort::Get()->UnlockCursor(); |
15 } | 15 } |
16 | 16 |
17 // static | 17 // static |
18 DefaultWindowResizer* DefaultWindowResizer::Create( | 18 DefaultWindowResizer* DefaultWindowResizer::Create( |
19 wm::WindowState* window_state) { | 19 wm::WindowState* window_state) { |
20 return new DefaultWindowResizer(window_state); | 20 return new DefaultWindowResizer(window_state); |
21 } | 21 } |
22 | 22 |
23 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { | 23 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { |
24 gfx::Rect bounds(CalculateBoundsForDrag(location)); | 24 gfx::Rect bounds(CalculateBoundsForDrag(location)); |
(...skipping 11 matching lines...) Expand all Loading... |
36 if (!did_move_or_resize_) | 36 if (!did_move_or_resize_) |
37 return; | 37 return; |
38 | 38 |
39 GetTarget()->SetBounds(details().initial_bounds_in_parent); | 39 GetTarget()->SetBounds(details().initial_bounds_in_parent); |
40 | 40 |
41 if (!details().restore_bounds.IsEmpty()) | 41 if (!details().restore_bounds.IsEmpty()) |
42 window_state_->SetRestoreBoundsInScreen(details().restore_bounds); | 42 window_state_->SetRestoreBoundsInScreen(details().restore_bounds); |
43 } | 43 } |
44 | 44 |
45 DefaultWindowResizer::DefaultWindowResizer(wm::WindowState* window_state) | 45 DefaultWindowResizer::DefaultWindowResizer(wm::WindowState* window_state) |
46 : WindowResizer(window_state), | 46 : WindowResizer(window_state), did_move_or_resize_(false) { |
47 did_move_or_resize_(false), | |
48 shell_(GetTarget()->GetShell()) { | |
49 DCHECK(details().is_resizable); | 47 DCHECK(details().is_resizable); |
50 shell_->LockCursor(); | 48 ShellPort::Get()->LockCursor(); |
51 } | 49 } |
52 | 50 |
53 } // namespace aura | 51 } // namespace aura |
OLD | NEW |