| 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 "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "ui/aura/desktop.h" | 8 #include "ui/aura/desktop.h" |
| 9 #include "ui/aura/event.h" | 9 #include "ui/aura/event.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 11 #include "ui/aura/screen_aura.h" | 11 #include "ui/aura/screen_aura.h" |
| 12 #include "ui/aura/window_types.h" | 12 #include "ui/aura/window_types.h" |
| 13 #include "ui/aura_shell/workspace/workspace.h" | 13 #include "ui/aura_shell/workspace/workspace.h" |
| 14 #include "ui/aura_shell/workspace/workspace_manager.h" | 14 #include "ui/aura_shell/workspace/workspace_manager.h" |
| 15 #include "ui/base/view_prop.h" | |
| 16 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 17 #include "views/widget/native_widget_aura.h" | 16 #include "views/widget/native_widget_aura.h" |
| 18 | 17 |
| 19 namespace aura_shell { | 18 namespace aura_shell { |
| 20 namespace internal { | 19 namespace internal { |
| 21 | 20 |
| 22 //////////////////////////////////////////////////////////////////////////////// | 21 //////////////////////////////////////////////////////////////////////////////// |
| 23 // DefaultContainerLayoutManager, public: | 22 // DefaultContainerLayoutManager, public: |
| 24 | 23 |
| 25 DefaultContainerLayoutManager::DefaultContainerLayoutManager( | 24 DefaultContainerLayoutManager::DefaultContainerLayoutManager( |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 | 154 |
| 156 Workspace* workspace = workspace_manager_->FindBy(child); | 155 Workspace* workspace = workspace_manager_->FindBy(child); |
| 157 gfx::Rect work_area = workspace->GetWorkAreaBounds(); | 156 gfx::Rect work_area = workspace->GetWorkAreaBounds(); |
| 158 requested_bounds->set_origin( | 157 requested_bounds->set_origin( |
| 159 gfx::Point(child->GetTargetBounds().x(), work_area.y())); | 158 gfx::Point(child->GetTargetBounds().x(), work_area.y())); |
| 160 *requested_bounds = requested_bounds->AdjustToFit(work_area); | 159 *requested_bounds = requested_bounds->AdjustToFit(work_area); |
| 161 } | 160 } |
| 162 | 161 |
| 163 } // namespace internal | 162 } // namespace internal |
| 164 } // namespace aura_shell | 163 } // namespace aura_shell |
| OLD | NEW |