| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mash/wm/shelf_layout.h" | 5 #include "mash/wm/shelf_layout.h" |
| 6 | 6 |
| 7 #include "components/mus/public/cpp/property_type_converters.h" | 7 #include "components/mus/public/cpp/property_type_converters.h" |
| 8 #include "components/mus/public/cpp/window.h" | 8 #include "components/mus/public/cpp/window.h" |
| 9 #include "components/mus/public/cpp/window_property.h" | 9 #include "components/mus/public/cpp/window_property.h" |
| 10 #include "mash/wm/property_util.h" | 10 #include "mash/wm/property_util.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 // We explicitly don't make assertions about the number of children in this | 21 // We explicitly don't make assertions about the number of children in this |
| 22 // layout as the number of children can vary when the application providing the | 22 // layout as the number of children can vary when the application providing the |
| 23 // shelf restarts. | 23 // shelf restarts. |
| 24 | 24 |
| 25 void ShelfLayout::LayoutWindow(mus::Window* window) { | 25 void ShelfLayout::LayoutWindow(mus::Window* window) { |
| 26 gfx::Size preferred_size = GetWindowPreferredSize(window); | 26 gfx::Size preferred_size = GetWindowPreferredSize(window); |
| 27 | 27 |
| 28 gfx::Rect container_bounds = owner()->bounds(); | 28 gfx::Rect container_bounds = owner()->bounds(); |
| 29 container_bounds.set_origin( | 29 container_bounds.set_origin( |
| 30 gfx::Point(0, container_bounds.height() - preferred_size.height())); | 30 gfx::Point(0, container_bounds.height() - preferred_size.height())); |
| 31 container_bounds.set_height(preferred_size.height()); |
| 31 window->SetBounds(container_bounds); | 32 window->SetBounds(container_bounds); |
| 32 } | 33 } |
| 33 | 34 |
| 34 } // namespace wm | 35 } // namespace wm |
| 35 } // namespace mash | 36 } // namespace mash |
| OLD | NEW |