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/default_container_layout_manager.h" | 5 #include "ui/aura_shell/default_container_layout_manager.h" |
6 | 6 |
7 #include "ui/aura/client/aura_constants.h" | 7 #include "ui/aura/client/aura_constants.h" |
8 #include "ui/aura/event.h" | 8 #include "ui/aura/event.h" |
9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 #include "ui/aura/screen_aura.h" | 10 #include "ui/aura/screen_aura.h" |
11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/aura/window_observer.h" | 12 #include "ui/aura/window_observer.h" |
13 #include "ui/aura/window_types.h" | 13 #include "ui/aura/window_types.h" |
14 #include "ui/aura_shell/property_util.h" | 14 #include "ui/aura_shell/property_util.h" |
15 #include "ui/aura_shell/show_state_controller.h" | 15 #include "ui/aura_shell/show_state_controller.h" |
| 16 #include "ui/aura_shell/window_util.h" |
16 #include "ui/aura_shell/workspace/workspace.h" | 17 #include "ui/aura_shell/workspace/workspace.h" |
17 #include "ui/aura_shell/workspace/workspace_manager.h" | 18 #include "ui/aura_shell/workspace/workspace_manager.h" |
18 #include "ui/base/ui_base_types.h" | 19 #include "ui/base/ui_base_types.h" |
19 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
20 #include "ui/views/widget/native_widget_aura.h" | 21 #include "ui/views/widget/native_widget_aura.h" |
21 | 22 |
22 namespace aura_shell { | 23 namespace aura_shell { |
23 namespace internal { | 24 namespace internal { |
24 | 25 |
25 //////////////////////////////////////////////////////////////////////////////// | 26 //////////////////////////////////////////////////////////////////////////////// |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 if (child->type() != aura::WINDOW_TYPE_NORMAL || child->transient_parent()) | 99 if (child->type() != aura::WINDOW_TYPE_NORMAL || child->transient_parent()) |
99 return; | 100 return; |
100 | 101 |
101 if (!child->GetProperty(aura::kShowStateKey)) | 102 if (!child->GetProperty(aura::kShowStateKey)) |
102 child->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); | 103 child->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); |
103 | 104 |
104 child->AddObserver(show_state_controller_.get()); | 105 child->AddObserver(show_state_controller_.get()); |
105 | 106 |
106 Workspace* workspace = workspace_manager_->GetActiveWorkspace(); | 107 Workspace* workspace = workspace_manager_->GetActiveWorkspace(); |
107 if (workspace) { | 108 if (workspace) { |
108 aura::Window* active = aura::RootWindow::GetInstance()->active_window(); | 109 aura::Window* active = aura_shell::GetActiveWindow(); |
109 // Active window may not be in the default container layer. | 110 // Active window may not be in the default container layer. |
110 if (!workspace->Contains(active)) | 111 if (!workspace->Contains(active)) |
111 active = NULL; | 112 active = NULL; |
112 if (workspace->AddWindowAfter(child, active)) | 113 if (workspace->AddWindowAfter(child, active)) |
113 return; | 114 return; |
114 } | 115 } |
115 // Create new workspace if new |child| doesn't fit to current workspace. | 116 // Create new workspace if new |child| doesn't fit to current workspace. |
116 Workspace* new_workspace = workspace_manager_->CreateWorkspace(); | 117 Workspace* new_workspace = workspace_manager_->CreateWorkspace(); |
117 new_workspace->AddWindowAfter(child, NULL); | 118 new_workspace->AddWindowAfter(child, NULL); |
118 new_workspace->Activate(); | 119 new_workspace->Activate(); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 adjusted_bounds = workspace->bounds(); | 180 adjusted_bounds = workspace->bounds(); |
180 // Don't | 181 // Don't |
181 if (child->GetTargetBounds() == adjusted_bounds) | 182 if (child->GetTargetBounds() == adjusted_bounds) |
182 return; | 183 return; |
183 } | 184 } |
184 SetChildBoundsDirect(child, adjusted_bounds); | 185 SetChildBoundsDirect(child, adjusted_bounds); |
185 } | 186 } |
186 | 187 |
187 } // namespace internal | 188 } // namespace internal |
188 } // namespace aura_shell | 189 } // namespace aura_shell |
OLD | NEW |