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

mash/catalog_viewer/catalog_viewer.cc

 // Copyright 2016 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 "mash/catalog_viewer/catalog_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace catalog_viewer {
 namespace {
 
 class CatalogViewerContents : public views::WidgetDelegateView,
                               public ui::TableModel,
                               public views::TextfieldController {
  public:
   CatalogViewerContents(CatalogViewer* catalog_viewer,
                         catalog::mojom::CatalogPtr catalog)
       : catalog_viewer_(catalog_viewer),
         catalog_(std::move(catalog)),
         table_view_(nullptr),
         table_view_parent_(nullptr),
         observer_(nullptr),
         capability_(new views::Textfield) {
-    const int kPadding = 5;
+    constexpr int kPadding = 5;
+    SetBorder(views::CreateEmptyBorder(gfx::Insets(kPadding)));
     set_background(views::Background::CreateStandardPanelBackground());
 
     views::GridLayout* layout = new views::GridLayout(this);
-    layout->SetInsets(kPadding, kPadding, kPadding, kPadding);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                        views::GridLayout::USE_PREF, 0, 0);
     columns->AddPaddingColumn(0, kPadding);
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                        views::GridLayout::USE_PREF, 0, 0);
 
     layout->StartRow(0, 0);
@@ skipping 185 matching lines @@
   windows_.push_back(window);
 }
 
 void CatalogViewer::Create(const service_manager::BindSourceInfo& source_info,
                            mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace catalog_viewer
 }  // namespace mash