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/drag_window_controller.h" | 5 #include "ash/wm/drag_window_controller.h" |
6 | 6 |
7 #include "ash/shell_window_ids.h" | 7 #include "ash/shell_window_ids.h" |
8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
9 #include "ui/aura/client/screen_position_client.h" | 9 #include "ui/aura/client/screen_position_client.h" |
| 10 #include "ui/aura/root_window.h" |
10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
11 #include "ui/compositor/layer.h" | 12 #include "ui/compositor/layer.h" |
12 #include "ui/compositor/scoped_layer_animation_settings.h" | 13 #include "ui/compositor/scoped_layer_animation_settings.h" |
13 #include "ui/views/corewm/shadow_types.h" | 14 #include "ui/views/corewm/shadow_types.h" |
14 #include "ui/views/corewm/window_util.h" | 15 #include "ui/views/corewm/window_util.h" |
15 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
16 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 namespace internal { | 20 namespace internal { |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 gfx::Rect layer_bounds = layer_->bounds(); | 117 gfx::Rect layer_bounds = layer_->bounds(); |
117 layer_bounds.set_origin(gfx::Point(0, 0)); | 118 layer_bounds.set_origin(gfx::Point(0, 0)); |
118 layer_->SetBounds(layer_bounds); | 119 layer_->SetBounds(layer_bounds); |
119 layer_->SetVisible(false); | 120 layer_->SetVisible(false); |
120 // Detach it from the current container. | 121 // Detach it from the current container. |
121 layer_->parent()->Remove(layer_); | 122 layer_->parent()->Remove(layer_); |
122 } | 123 } |
123 | 124 |
124 } // namespace internal | 125 } // namespace internal |
125 } // namespace ash | 126 } // namespace ash |
OLD | NEW |