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/window_util.h" | 5 #include "ash/wm/window_util.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "ash/wm/window_properties.h" | 12 #include "ash/wm/window_properties.h" |
13 #include "ash/wm/window_state.h" | 13 #include "ash/wm/window_state.h" |
14 #include "ui/aura/client/activation_client.h" | 14 #include "ui/aura/client/activation_client.h" |
15 #include "ui/aura/client/aura_constants.h" | 15 #include "ui/aura/client/aura_constants.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_delegate.h" | 17 #include "ui/aura/window_delegate.h" |
18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
19 #include "ui/gfx/display.h" | 19 #include "ui/gfx/display.h" |
20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
21 #include "ui/gfx/screen.h" | 21 #include "ui/gfx/screen.h" |
22 #include "ui/gfx/size.h" | 22 #include "ui/gfx/size.h" |
23 #include "ui/views/corewm/window_util.h" | |
24 #include "ui/views/view.h" | 23 #include "ui/views/view.h" |
25 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
| 25 #include "ui/wm/core/window_util.h" |
26 | 26 |
27 namespace ash { | 27 namespace ash { |
28 namespace wm { | 28 namespace wm { |
29 | 29 |
30 namespace { | 30 namespace { |
31 | 31 |
32 // Returns the default width of a snapped window. | 32 // Returns the default width of a snapped window. |
33 int GetDefaultSnappedWindowWidth(aura::Window* window) { | 33 int GetDefaultSnappedWindowWidth(aura::Window* window) { |
34 const float kSnappedWidthWorkspaceRatio = 0.5f; | 34 const float kSnappedWidthWorkspaceRatio = 0.5f; |
35 | 35 |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 ++i) { | 181 ++i) { |
182 ReparentChildWithTransientChildren( | 182 ReparentChildWithTransientChildren( |
183 views::corewm::GetTransientChildren(child)[i], | 183 views::corewm::GetTransientChildren(child)[i], |
184 old_parent, | 184 old_parent, |
185 new_parent); | 185 new_parent); |
186 } | 186 } |
187 } | 187 } |
188 | 188 |
189 } // namespace wm | 189 } // namespace wm |
190 } // namespace ash | 190 } // namespace ash |
OLD | NEW |