OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/workspace/workspace.h" | 5 #include "ash/wm/workspace/workspace.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
| 9 #include "ash/wm/property_util.h" |
| 10 #include "ash/wm/window_util.h" |
| 11 #include "ash/wm/workspace/workspace_manager.h" |
9 #include "base/logging.h" | 12 #include "base/logging.h" |
10 #include "ui/aura/client/aura_constants.h" | 13 #include "ui/aura/client/aura_constants.h" |
11 #include "ui/aura/root_window.h" | 14 #include "ui/aura/root_window.h" |
12 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
13 #include "ui/aura_shell/property_util.h" | |
14 #include "ui/aura_shell/window_util.h" | |
15 #include "ui/aura_shell/workspace/workspace_manager.h" | |
16 #include "ui/base/ui_base_types.h" | 16 #include "ui/base/ui_base_types.h" |
17 #include "ui/gfx/compositor/layer.h" | 17 #include "ui/gfx/compositor/layer.h" |
18 #include "ui/gfx/compositor/layer_animator.h" | 18 #include "ui/gfx/compositor/layer_animator.h" |
19 | 19 |
20 namespace { | 20 namespace { |
21 // Horizontal margin between windows. | 21 // Horizontal margin between windows. |
22 const int kWindowHorizontalMargin = 10; | 22 const int kWindowHorizontalMargin = 10; |
23 | 23 |
24 // Maximum number of windows a workspace can have. | 24 // Maximum number of windows a workspace can have. |
25 size_t g_max_windows_per_workspace = 2; | 25 size_t g_max_windows_per_workspace = 2; |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 | 277 |
278 // static | 278 // static |
279 size_t Workspace::SetMaxWindowsCount(size_t max) { | 279 size_t Workspace::SetMaxWindowsCount(size_t max) { |
280 int old = g_max_windows_per_workspace; | 280 int old = g_max_windows_per_workspace; |
281 g_max_windows_per_workspace = max; | 281 g_max_windows_per_workspace = max; |
282 return old; | 282 return old; |
283 } | 283 } |
284 | 284 |
285 } // namespace internal | 285 } // namespace internal |
286 } // namespace aura_shell | 286 } // namespace aura_shell |
OLD | NEW |