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

ui/views/layout/grid_layout.h

 // 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.
 
 #ifndef UI_VIEWS_LAYOUT_GRID_LAYOUT_H_
 #define UI_VIEWS_LAYOUT_GRID_LAYOUT_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"

[sky, 2017/05/05 14:36:39]

If you can, remove this include.

[Bret, 2017/05/06 00:36:43]

Done.

 #include "ui/gfx/geometry/size.h"
 #include "ui/views/layout/layout_manager.h"
 
 // GridLayout is a LayoutManager that positions child Views in a grid. You
 // define the structure of the Grid first, then add the Views.
 // The following creates a trivial grid with two columns separated by
 // a column with padding:
 // ColumnSet* columns = layout->AddColumnSet(0); // Give this column set an
 //                                               // identifier of 0.
 // columns->AddColumn(FILL, // Views are horizontally resized to fill column.
@@ skipping 72 matching lines @@
     // The column size is fixed.
     FIXED,
 
     // The preferred size of the view is used to determine the column size.
     USE_PREF
   };
 
   explicit GridLayout(View* host);
   ~GridLayout() override;
 
-  // Creates a GridLayout with kPanel*Margin insets.
+  // Creates a GridLayout, assigns it as the LayoutManager of |host|, and gives
+  // it a INSETS_PANEL-sized padding border.
   static GridLayout* CreatePanel(View* host);
 
-  // Sets the insets. All views are placed relative to these offsets.
-  void SetInsets(int top, int left, int bottom, int right);
-  void SetInsets(const gfx::Insets& insets);
-
   // Creates a new column set with the specified id and returns it.
   // The id is later used when starting a new row.
   // GridLayout takes ownership of the ColumnSet and will delete it when
   // the GridLayout is deleted.
   ColumnSet* AddColumnSet(int id);
 
   // Returns the column set for the specified id, or NULL if one doesn't exist.
   ColumnSet* GetColumnSet(int id);
 
   // Adds a padding row. Padding rows typically don't have any views, and
@@ skipping 108 matching lines @@
 
   // Current row.
   int current_row_;
 
   // Current column.
   int next_column_;
 
   // Column set for the current row. This is null for padding rows.
   ColumnSet* current_row_col_set_;
 
-  // Insets.
-  gfx::Insets insets_;
-
   // Set to true when adding a View.
   bool adding_view_;
 
   // ViewStates. This is ordered by row_span in ascending order.
   mutable std::vector<std::unique_ptr<ViewState>> view_states_;
 
   // ColumnSets.
   mutable std::vector<std::unique_ptr<ColumnSet>> column_sets_;
 
   // Rows.
@@ skipping 119 matching lines @@
   // The master column of those columns that are linked. See Column
   // for a description of what the master column is.
   std::vector<Column*> master_columns_;
 
   DISALLOW_COPY_AND_ASSIGN(ColumnSet);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_LAYOUT_GRID_LAYOUT_H_