| OLD | NEW |
| 1 // Copyright (c) 2010 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 "views/box_layout.h" | 5 #include "views/layout/box_layout.h" |
| 6 | 6 |
| 7 namespace views { | 7 namespace views { |
| 8 | 8 |
| 9 BoxLayout::BoxLayout(BoxLayout::Orientation orientation, | 9 BoxLayout::BoxLayout(BoxLayout::Orientation orientation, |
| 10 int inside_border_horizontal_spacing, | 10 int inside_border_horizontal_spacing, |
| 11 int inside_border_vertical_spacing, | 11 int inside_border_vertical_spacing, |
| 12 int between_child_spacing) | 12 int between_child_spacing) |
| 13 : orientation_(orientation), | 13 : orientation_(orientation), |
| 14 inside_border_horizontal_spacing_(inside_border_horizontal_spacing), | 14 inside_border_horizontal_spacing_(inside_border_horizontal_spacing), |
| 15 inside_border_vertical_spacing_(inside_border_vertical_spacing), | 15 inside_border_vertical_spacing_(inside_border_vertical_spacing), |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 position += between_child_spacing_; | 60 position += between_child_spacing_; |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 gfx::Insets insets(host->GetInsets()); | 63 gfx::Insets insets(host->GetInsets()); |
| 64 return gfx::Size( | 64 return gfx::Size( |
| 65 bounds.width() + insets.width() + 2 * inside_border_horizontal_spacing_, | 65 bounds.width() + insets.width() + 2 * inside_border_horizontal_spacing_, |
| 66 bounds.height() + insets.height() + 2 * inside_border_vertical_spacing_); | 66 bounds.height() + insets.height() + 2 * inside_border_vertical_spacing_); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace views | 69 } // namespace views |
| OLD | NEW |