| 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 #ifndef VIEWS_LAYOUT_GRID_LAYOUT_H_ | 5 #ifndef UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| 6 #define VIEWS_LAYOUT_GRID_LAYOUT_H_ | 6 #define UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "views/layout/layout_manager.h" | 12 #include "views/layout/layout_manager.h" |
| 13 #include "views/view.h" | 13 #include "views/view.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 class Insets; | 16 class Insets; |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 | 361 |
| 362 // The master column of those columns that are linked. See Column | 362 // The master column of those columns that are linked. See Column |
| 363 // for a description of what the master column is. | 363 // for a description of what the master column is. |
| 364 std::vector<Column*> master_columns_; | 364 std::vector<Column*> master_columns_; |
| 365 | 365 |
| 366 DISALLOW_COPY_AND_ASSIGN(ColumnSet); | 366 DISALLOW_COPY_AND_ASSIGN(ColumnSet); |
| 367 }; | 367 }; |
| 368 | 368 |
| 369 } // namespace views | 369 } // namespace views |
| 370 | 370 |
| 371 #endif // VIEWS_LAYOUT_GRID_LAYOUT_H_ | 371 #endif // UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| OLD | NEW |