| 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 #include "ui/views/layout/grid_layout.h" | 5 #include "ui/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/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
| 13 #include "ui/views/layout/layout_constants.h" | |
| 14 #include "ui/views/layout/layout_provider.h" | 13 #include "ui/views/layout/layout_provider.h" |
| 15 #include "ui/views/view.h" | 14 #include "ui/views/view.h" |
| 16 #include "ui/views/window/dialog_delegate.h" | 15 #include "ui/views/window/dialog_delegate.h" |
| 17 | 16 |
| 18 namespace views { | 17 namespace views { |
| 19 | 18 |
| 20 // LayoutElement ------------------------------------------------------ | 19 // LayoutElement ------------------------------------------------------ |
| 21 | 20 |
| 22 // A LayoutElement has a size and location along one axis. It contains | 21 // A LayoutElement has a size and location along one axis. It contains |
| 23 // methods that are used along both axis. | 22 // methods that are used along both axis. |
| (...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 | 1022 |
| 1024 ColumnSet* GridLayout::GetLastValidColumnSet() { | 1023 ColumnSet* GridLayout::GetLastValidColumnSet() { |
| 1025 for (int i = current_row_ - 1; i >= 0; --i) { | 1024 for (int i = current_row_ - 1; i >= 0; --i) { |
| 1026 if (rows_[i]->column_set()) | 1025 if (rows_[i]->column_set()) |
| 1027 return rows_[i]->column_set(); | 1026 return rows_[i]->column_set(); |
| 1028 } | 1027 } |
| 1029 return nullptr; | 1028 return nullptr; |
| 1030 } | 1029 } |
| 1031 | 1030 |
| 1032 } // namespace views | 1031 } // namespace views |
| OLD | NEW |