| 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 #include "views/grid_layout.h" | 5 #include "views/layout/grid_layout.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util-inl.h" | 10 #include "base/stl_util-inl.h" |
| 11 #include "gfx/insets.h" | 11 #include "gfx/insets.h" |
| 12 #include "views/layout/layout_constants.h" | 12 #include "views/layout/layout_constants.h" |
| 13 #include "views/view.h" | 13 #include "views/view.h" |
| 14 | 14 |
| 15 namespace views { | 15 namespace views { |
| (...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1061 | 1061 |
| 1062 ColumnSet* GridLayout::GetLastValidColumnSet() { | 1062 ColumnSet* GridLayout::GetLastValidColumnSet() { |
| 1063 for (int i = current_row_ - 1; i >= 0; --i) { | 1063 for (int i = current_row_ - 1; i >= 0; --i) { |
| 1064 if (rows_[i]->column_set()) | 1064 if (rows_[i]->column_set()) |
| 1065 return rows_[i]->column_set(); | 1065 return rows_[i]->column_set(); |
| 1066 } | 1066 } |
| 1067 return NULL; | 1067 return NULL; |
| 1068 } | 1068 } |
| 1069 | 1069 |
| 1070 } // namespace views | 1070 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6382009:
views: Move grid_layout files into layout directory. Final Part. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src