| 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/desktop_layout_manager.h" | 5 #include "ui/aura_shell/desktop_layout_manager.h" |
| 6 | 6 |
| 7 #include "ui/aura/window.h" |
| 7 #include "ui/aura_shell/shelf_layout_controller.h" | 8 #include "ui/aura_shell/shelf_layout_controller.h" |
| 8 #include "ui/aura/window.h" | 9 #include "ui/views/widget/widget.h" |
| 9 #include "views/widget/widget.h" | |
| 10 | 10 |
| 11 namespace aura_shell { | 11 namespace aura_shell { |
| 12 namespace internal { | 12 namespace internal { |
| 13 | 13 |
| 14 //////////////////////////////////////////////////////////////////////////////// | 14 //////////////////////////////////////////////////////////////////////////////// |
| 15 // DesktopLayoutManager, public: | 15 // DesktopLayoutManager, public: |
| 16 | 16 |
| 17 DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner) | 17 DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner) |
| 18 : owner_(owner), | 18 : owner_(owner), |
| 19 background_widget_(NULL), | 19 background_widget_(NULL), |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 } | 51 } |
| 52 | 52 |
| 53 void DesktopLayoutManager::SetChildBounds(aura::Window* child, | 53 void DesktopLayoutManager::SetChildBounds(aura::Window* child, |
| 54 const gfx::Rect& requested_bounds) { | 54 const gfx::Rect& requested_bounds) { |
| 55 SetChildBoundsDirect(child, requested_bounds); | 55 SetChildBoundsDirect(child, requested_bounds); |
| 56 } | 56 } |
| 57 | 57 |
| 58 | 58 |
| 59 } // namespace internal | 59 } // namespace internal |
| 60 } // namespace aura_shell | 60 } // namespace aura_shell |
| OLD | NEW |