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/workspace/workspace_manager.h" | 5 #include "ash/wm/workspace/workspace_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 | 9 |
10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| 11 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shell.h" | 12 #include "ash/shell.h" |
12 #include "ash/shell_window_ids.h" | 13 #include "ash/shell_window_ids.h" |
13 #include "ash/wm/base_layout_manager.h" | 14 #include "ash/wm/base_layout_manager.h" |
14 #include "ash/wm/frame_painter.h" | 15 #include "ash/wm/frame_painter.h" |
15 #include "ash/wm/property_util.h" | 16 #include "ash/wm/property_util.h" |
16 #include "ash/wm/shelf_layout_manager.h" | |
17 #include "ash/wm/window_animations.h" | 17 #include "ash/wm/window_animations.h" |
18 #include "ash/wm/window_properties.h" | 18 #include "ash/wm/window_properties.h" |
19 #include "ash/wm/window_util.h" | 19 #include "ash/wm/window_util.h" |
20 #include "ash/wm/workspace/auto_window_management.h" | 20 #include "ash/wm/workspace/auto_window_management.h" |
21 #include "ash/wm/workspace/desktop_background_fade_controller.h" | 21 #include "ash/wm/workspace/desktop_background_fade_controller.h" |
22 #include "ash/wm/workspace/workspace_animations.h" | 22 #include "ash/wm/workspace/workspace_animations.h" |
23 #include "ash/wm/workspace/workspace_cycler.h" | 23 #include "ash/wm/workspace/workspace_cycler.h" |
24 #include "ash/wm/workspace/workspace_cycler_animator.h" | 24 #include "ash/wm/workspace/workspace_cycler_animator.h" |
25 #include "ash/wm/workspace/workspace_cycler_configuration.h" | 25 #include "ash/wm/workspace/workspace_cycler_configuration.h" |
26 #include "ash/wm/workspace/workspace_layout_manager.h" | 26 #include "ash/wm/workspace/workspace_layout_manager.h" |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 new_workspace->window()->Show(); | 797 new_workspace->window()->Show(); |
798 ReparentWindow(window, new_workspace->window(), NULL); | 798 ReparentWindow(window, new_workspace->window(), NULL); |
799 if (is_active) { | 799 if (is_active) { |
800 SetActiveWorkspace(new_workspace, SWITCH_TRACKED_BY_WORKSPACE_CHANGED, | 800 SetActiveWorkspace(new_workspace, SWITCH_TRACKED_BY_WORKSPACE_CHANGED, |
801 base::TimeDelta()); | 801 base::TimeDelta()); |
802 } | 802 } |
803 } | 803 } |
804 | 804 |
805 } // namespace internal | 805 } // namespace internal |
806 } // namespace ash | 806 } // namespace ash |
OLD | NEW |