| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/wm/public/window_manager.h" | 5 #include "athena/wm/public/window_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "athena/common/container_priorities.h" | 9 #include "athena/common/container_priorities.h" |
| 10 #include "athena/input/public/accelerator_manager.h" | 10 #include "athena/input/public/accelerator_manager.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 } | 133 } |
| 134 // |title_drag_controller_| needs to be reset before |container_|. | 134 // |title_drag_controller_| needs to be reset before |container_|. |
| 135 title_drag_controller_.reset(); | 135 title_drag_controller_.reset(); |
| 136 container_.reset(); | 136 container_.reset(); |
| 137 instance = NULL; | 137 instance = NULL; |
| 138 } | 138 } |
| 139 | 139 |
| 140 void WindowManagerImpl::Layout() { | 140 void WindowManagerImpl::Layout() { |
| 141 if (!container_) | 141 if (!container_) |
| 142 return; | 142 return; |
| 143 gfx::Rect bounds = gfx::Rect(container_->bounds().size()); | 143 gfx::Rect bounds = ScreenManager::Get()->GetWorkArea(); |
| 144 const aura::Window::Windows& children = container_->children(); | 144 const aura::Window::Windows& children = container_->children(); |
| 145 for (aura::Window::Windows::const_iterator iter = children.begin(); | 145 for (aura::Window::Windows::const_iterator iter = children.begin(); |
| 146 iter != children.end(); | 146 iter != children.end(); |
| 147 ++iter) { | 147 ++iter) { |
| 148 if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL) | 148 if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL) |
| 149 (*iter)->SetBounds(bounds); | 149 (*iter)->SetBounds(bounds); |
| 150 } | 150 } |
| 151 } | 151 } |
| 152 | 152 |
| 153 void WindowManagerImpl::ToggleOverview() { | 153 void WindowManagerImpl::ToggleOverview() { |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 DCHECK(!instance); | 291 DCHECK(!instance); |
| 292 } | 292 } |
| 293 | 293 |
| 294 // static | 294 // static |
| 295 WindowManager* WindowManager::GetInstance() { | 295 WindowManager* WindowManager::GetInstance() { |
| 296 DCHECK(instance); | 296 DCHECK(instance); |
| 297 return instance; | 297 return instance; |
| 298 } | 298 } |
| 299 | 299 |
| 300 } // namespace athena | 300 } // namespace athena |
| OLD | NEW |