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/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "ash/shell_window_ids.h" | 12 #include "ash/shell_window_ids.h" |
13 #include "ash/wm/activation_controller.h" | |
14 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" |
15 #include "ui/aura/client/activation_client.h" | 14 #include "ui/aura/client/activation_client.h" |
16 #include "ui/aura/client/aura_constants.h" | 15 #include "ui/aura/client/aura_constants.h" |
17 #include "ui/aura/root_window.h" | 16 #include "ui/aura/root_window.h" |
18 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
19 #include "ui/aura/window_delegate.h" | 18 #include "ui/aura/window_delegate.h" |
20 #include "ui/compositor/layer.h" | 19 #include "ui/compositor/layer.h" |
21 #include "ui/gfx/display.h" | 20 #include "ui/gfx/display.h" |
22 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
23 #include "ui/gfx/screen.h" | 22 #include "ui/gfx/screen.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 return false; | 202 return false; |
204 aura::Window* window_container = | 203 aura::Window* window_container = |
205 ash::Shell::GetContainer(target_root, window->parent()->id()); | 204 ash::Shell::GetContainer(target_root, window->parent()->id()); |
206 // Move the window to the target launcher. | 205 // Move the window to the target launcher. |
207 window_container->AddChild(window); | 206 window_container->AddChild(window); |
208 return true; | 207 return true; |
209 } | 208 } |
210 | 209 |
211 } // namespace wm | 210 } // namespace wm |
212 } // namespace ash | 211 } // namespace ash |
OLD | NEW |