| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 CHROME_VIEWS_GRID_LAYOUT_H__ | 5 #ifndef CHROME_VIEWS_GRID_LAYOUT_H__ |
| 6 #define CHROME_VIEWS_GRID_LAYOUT_H__ | 6 #define CHROME_VIEWS_GRID_LAYOUT_H__ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 // Adds a view using the default alignment from the column. | 130 // Adds a view using the default alignment from the column. |
| 131 // As a convenience this adds the view to the host. The view becomes owned | 131 // As a convenience this adds the view to the host. The view becomes owned |
| 132 // by the host, and NOT this GridLayout. | 132 // by the host, and NOT this GridLayout. |
| 133 void AddView(View* view, int col_span, int row_span); | 133 void AddView(View* view, int col_span, int row_span); |
| 134 | 134 |
| 135 // Adds a view with the specified alignment and spans. | 135 // Adds a view with the specified alignment and spans. |
| 136 // As a convenience this adds the view to the host. The view becomes owned | 136 // As a convenience this adds the view to the host. The view becomes owned |
| 137 // by the host, and NOT this GridLayout. | 137 // by the host, and NOT this GridLayout. |
| 138 void AddView(View* view, int col_span, int row_span, Alignment h_align, | 138 void AddView(View* view, int col_span, int row_span, Alignment h_align, |
| 139 » Alignment v_align); | 139 Alignment v_align); |
| 140 | 140 |
| 141 // Adds a view with the specified alignment and spans. If | 141 // Adds a view with the specified alignment and spans. If |
| 142 // pref_width/pref_height is > 0 then the preferred width/height of the view | 142 // pref_width/pref_height is > 0 then the preferred width/height of the view |
| 143 // is fixed to the specified value. | 143 // is fixed to the specified value. |
| 144 // As a convenience this adds the view to the host. The view becomes owned | 144 // As a convenience this adds the view to the host. The view becomes owned |
| 145 // by the host, and NOT this GridLayout. | 145 // by the host, and NOT this GridLayout. |
| 146 void AddView(View* view, int col_span, int row_span, | 146 void AddView(View* view, int col_span, int row_span, |
| 147 Alignment h_align, Alignment v_align, | 147 Alignment h_align, Alignment v_align, |
| 148 int pref_width, int pref_height); | 148 int pref_width, int pref_height); |
| 149 | 149 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 // for a description of what the master column is. | 346 // for a description of what the master column is. |
| 347 std::vector<Column*> master_columns_; | 347 std::vector<Column*> master_columns_; |
| 348 | 348 |
| 349 DISALLOW_EVIL_CONSTRUCTORS(ColumnSet); | 349 DISALLOW_EVIL_CONSTRUCTORS(ColumnSet); |
| 350 }; | 350 }; |
| 351 | 351 |
| 352 } // namespace views | 352 } // namespace views |
| 353 | 353 |
| 354 #endif // CHROME_VIEWS_GRID_LAYOUT_H__ | 354 #endif // CHROME_VIEWS_GRID_LAYOUT_H__ |
| 355 | 355 |
| OLD | NEW |