| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ | 5 #ifndef UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ |
| 6 #define UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ | 6 #define UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "ui/gfx/insets.h" | 10 #include "ui/gfx/geometry/insets.h" |
| 11 #include "ui/views/layout/layout_manager.h" | 11 #include "ui/views/layout/layout_manager.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 class Rect; | 14 class Rect; |
| 15 class Size; | 15 class Size; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace views { | 18 namespace views { |
| 19 | 19 |
| 20 class View; | 20 class View; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // The alignment of children in the cross axis. This is | 133 // The alignment of children in the cross axis. This is |
| 134 // CROSS_AXIS_ALIGNMENT_STRETCH by default. | 134 // CROSS_AXIS_ALIGNMENT_STRETCH by default. |
| 135 CrossAxisAlignment cross_axis_alignment_; | 135 CrossAxisAlignment cross_axis_alignment_; |
| 136 | 136 |
| 137 DISALLOW_IMPLICIT_CONSTRUCTORS(BoxLayout); | 137 DISALLOW_IMPLICIT_CONSTRUCTORS(BoxLayout); |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 } // namespace views | 140 } // namespace views |
| 141 | 141 |
| 142 #endif // UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ | 142 #endif // UI_VIEWS_LAYOUT_BOX_LAYOUT_H_ |
| OLD | NEW |