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.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/property_util.h" | 8 #include "ash/wm/property_util.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/aura/window_delegate.h" | 12 #include "ui/aura/window_delegate.h" |
13 #include "ui/base/hit_test.h" | 13 #include "ui/base/hit_test.h" |
14 #include "ui/base/ui_base_types.h" | 14 #include "ui/base/ui_base_types.h" |
15 #include "ui/gfx/screen.h" | 15 #include "ui/gfx/screen.h" |
16 | 16 |
17 namespace ash { | 17 namespace ash { |
18 | 18 |
19 DefaultWindowResizer::~DefaultWindowResizer() { | 19 DefaultWindowResizer::~DefaultWindowResizer() { |
20 ash::Shell::GetInstance()->cursor_manager()->UnlockCursor(); | 20 ash::Shell::GetInstance()->cursor_manager()->UnlockCursor(); |
21 } | 21 } |
22 | 22 |
23 // static | 23 // static |
24 DefaultWindowResizer* | 24 DefaultWindowResizer* |
25 DefaultWindowResizer::Create(aura::Window* window, | 25 DefaultWindowResizer::Create(aura::Window* window, |
26 const gfx::Point& location, | 26 const gfx::Point& location, |
27 int window_component) { | 27 int window_component, |
28 Details details(window, location, window_component); | 28 aura::client::WindowMoveSource source) { |
| 29 Details details(window, location, window_component, source); |
29 return details.is_resizable ? new DefaultWindowResizer(details) : NULL; | 30 return details.is_resizable ? new DefaultWindowResizer(details) : NULL; |
30 } | 31 } |
31 | 32 |
32 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { | 33 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { |
33 gfx::Rect bounds(CalculateBoundsForDrag(details_, location)); | 34 gfx::Rect bounds(CalculateBoundsForDrag(details_, location)); |
34 if (bounds != details_.window->bounds()) { | 35 if (bounds != details_.window->bounds()) { |
35 if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty()) | 36 if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty()) |
36 ClearRestoreBounds(details_.window); | 37 ClearRestoreBounds(details_.window); |
37 did_move_or_resize_ = true; | 38 did_move_or_resize_ = true; |
38 details_.window->SetBounds(bounds); | 39 details_.window->SetBounds(bounds); |
(...skipping 18 matching lines...) Expand all Loading... |
57 } | 58 } |
58 | 59 |
59 DefaultWindowResizer::DefaultWindowResizer(const Details& details) | 60 DefaultWindowResizer::DefaultWindowResizer(const Details& details) |
60 : details_(details), | 61 : details_(details), |
61 did_move_or_resize_(false) { | 62 did_move_or_resize_(false) { |
62 DCHECK(details_.is_resizable); | 63 DCHECK(details_.is_resizable); |
63 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); | 64 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); |
64 } | 65 } |
65 | 66 |
66 } // namespace aura | 67 } // namespace aura |
OLD | NEW |