| 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/layout/layout_constants.h" | 12 #include "ui/views/layout/layout_constants.h" |
| 13 #include "ui/views/layout/layout_provider.h" |
| 13 #include "ui/views/view.h" | 14 #include "ui/views/view.h" |
| 14 #include "ui/views/views_delegate.h" | |
| 15 #include "ui/views/window/dialog_delegate.h" | 15 #include "ui/views/window/dialog_delegate.h" |
| 16 | 16 |
| 17 namespace views { | 17 namespace views { |
| 18 | 18 |
| 19 // LayoutElement ------------------------------------------------------ | 19 // LayoutElement ------------------------------------------------------ |
| 20 | 20 |
| 21 // 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 |
| 22 // methods that are used along both axis. | 22 // methods that are used along both axis. |
| 23 class LayoutElement { | 23 class LayoutElement { |
| 24 public: | 24 public: |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 adding_view_(false) { | 645 adding_view_(false) { |
| 646 DCHECK(host); | 646 DCHECK(host); |
| 647 } | 647 } |
| 648 | 648 |
| 649 GridLayout::~GridLayout() { | 649 GridLayout::~GridLayout() { |
| 650 } | 650 } |
| 651 | 651 |
| 652 // static | 652 // static |
| 653 GridLayout* GridLayout::CreatePanel(View* host) { | 653 GridLayout* GridLayout::CreatePanel(View* host) { |
| 654 GridLayout* layout = new GridLayout(host); | 654 GridLayout* layout = new GridLayout(host); |
| 655 layout->SetInsets( | 655 layout->SetInsets(LayoutProvider::Get()->GetInsetsMetric(INSETS_PANEL)); |
| 656 ViewsDelegate::GetInstance()->GetInsetsMetric(InsetsMetric::PANEL)); | |
| 657 host->SetLayoutManager(layout); | 656 host->SetLayoutManager(layout); |
| 658 return layout; | 657 return layout; |
| 659 } | 658 } |
| 660 | 659 |
| 661 void GridLayout::SetInsets(int top, int left, int bottom, int right) { | 660 void GridLayout::SetInsets(int top, int left, int bottom, int right) { |
| 662 insets_.Set(top, left, bottom, right); | 661 insets_.Set(top, left, bottom, right); |
| 663 } | 662 } |
| 664 | 663 |
| 665 void GridLayout::SetInsets(const gfx::Insets& insets) { | 664 void GridLayout::SetInsets(const gfx::Insets& insets) { |
| 666 insets_ = insets; | 665 insets_ = insets; |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1028 | 1027 |
| 1029 ColumnSet* GridLayout::GetLastValidColumnSet() { | 1028 ColumnSet* GridLayout::GetLastValidColumnSet() { |
| 1030 for (int i = current_row_ - 1; i >= 0; --i) { | 1029 for (int i = current_row_ - 1; i >= 0; --i) { |
| 1031 if (rows_[i]->column_set()) | 1030 if (rows_[i]->column_set()) |
| 1032 return rows_[i]->column_set(); | 1031 return rows_[i]->column_set(); |
| 1033 } | 1032 } |
| 1034 return nullptr; | 1033 return nullptr; |
| 1035 } | 1034 } |
| 1036 | 1035 |
| 1037 } // namespace views | 1036 } // namespace views |
| OLD | NEW |