Remove GridLayout::SetInsets in favor of an empty border on the host.

ui/views/layout/grid_layout.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/layout/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "ui/views/border.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/layout/layout_provider.h"
 #include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 // LayoutElement ------------------------------------------------------
 
 // A LayoutElement has a size and location along one axis. It contains
@@ skipping 623 matching lines @@
       adding_view_(false) {
   DCHECK(host);
 }
 
 GridLayout::~GridLayout() {
 }
 
 // static
 GridLayout* GridLayout::CreatePanel(View* host) {
   GridLayout* layout = new GridLayout(host);
-  layout->SetInsets(LayoutProvider::Get()->GetInsetsMetric(INSETS_PANEL));
+  host->SetBorder(
+      CreateEmptyBorder(LayoutProvider::Get()->GetInsetsMetric(INSETS_PANEL)));
   host->SetLayoutManager(layout);
   return layout;
 }
 
-void GridLayout::SetInsets(int top, int left, int bottom, int right) {
-  insets_.Set(top, left, bottom, right);
-}
-
-void GridLayout::SetInsets(const gfx::Insets& insets) {
-  insets_ = insets;
-}
-
 ColumnSet* GridLayout::AddColumnSet(int id) {
   DCHECK(GetColumnSet(id) == nullptr);
   column_sets_.push_back(base::WrapUnique(new ColumnSet(id)));
   return column_sets_.back().get();
 }
 
 ColumnSet* GridLayout::GetColumnSet(int id) {
   for (const auto& column_set : column_sets_) {
     if (column_set->id_ == id) {
       return column_set.get();
@@ skipping 99 matching lines @@
   // SizeRowsAndColumns sets the size and location of each row/column, but
   // not of the views.
   gfx::Size pref;
   SizeRowsAndColumns(true, host_->width(), host_->height(), &pref);
 
   // Size each view.
   for (const auto& view_state : view_states_) {
     ColumnSet* column_set = view_state->column_set;
     View* view = view_state->view;
     DCHECK(view);
-    int x = column_set->columns_[view_state->start_col]->Location() +
-            insets_.left();
+    const gfx::Insets& insets = host_->GetInsets();
+    int x =
+        column_set->columns_[view_state->start_col]->Location() + insets.left();
     int width = column_set->GetColumnWidth(view_state->start_col,
                                            view_state->col_span);
     CalculateSize(view_state->pref_width, view_state->h_align,
                   &x, &width);
-    int y = rows_[view_state->start_row]->Location() + insets_.top();
+    int y = rows_[view_state->start_row]->Location() + insets.top();
     int height = LayoutElement::TotalSize(view_state->start_row,
                                           view_state->row_span, &rows_);
     if (view_state->v_align == BASELINE && view_state->baseline != -1) {
       y += rows_[view_state->start_row]->max_ascent() - view_state->baseline;
       height = view_state->pref_height;
     } else {
       CalculateSize(view_state->pref_height, view_state->v_align, &y, &height);
     }
     view->SetBounds(x, y, width, height);
   }
@@ skipping 28 matching lines @@
   if (rows_.empty())
     return;
 
   // Calculate the preferred width of each of the columns. Some views'
   // preferred heights are derived from their width, as such we need to
   // calculate the size of the columns first.
   for (const auto& column_set : column_sets_) {
     column_set->CalculateSize();
     pref->set_width(std::max(pref->width(), column_set->LayoutWidth()));
   }
-  pref->set_width(pref->width() + insets_.width());
+  const gfx::Insets& insets = host_->GetInsets();
+  pref->set_width(pref->width() + insets.width());
 
   // Go over the columns again and set them all to the size we settled for.
   width = width ? width : pref->width();
   for (const auto& column_set : column_sets_) {
     // We're doing a layout, divvy up any extra space.
-    column_set->Resize(width - column_set->LayoutWidth() - insets_.left() -
-                       insets_.right());
+    column_set->Resize(width - column_set->LayoutWidth() - insets.left() -
+                       insets.right());
     // And reset the x coordinates.
     column_set->ResetColumnXCoordinates();
   }
 
   // Reset the height of each row.
   LayoutElement::ResetSizes(&rows_);
 
   // Do the following:
   // . If the view is aligned along it's baseline, obtain the baseline from the
   //   view and update the rows ascent/descent.
@@ skipping 47 matching lines @@
 
     // Distribute the remaining height.
     DistributeRemainingHeight(view_state);
   }
 
   // Update the location of each of the rows.
   LayoutElement::CalculateLocationsFromSize(&rows_);
 
   // We now know the preferred height, set it here.
   pref->set_height(rows_.back()->Location() + rows_.back()->Size() +
-                   insets_.height());
+                   insets.height());
 
   if (layout && height != pref->height()) {
     // We're doing a layout, and the height differs from the preferred height,
     // divvy up the extra space.
     LayoutElement::DistributeDelta(height - pref->height(), &rows_);
 
     // Reset y locations.
     LayoutElement::CalculateLocationsFromSize(&rows_);
   }
 }
@@ skipping 99 matching lines @@
 
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return nullptr;
 }
 
 }  // namespace views