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

ui/message_center/views/message_center_button_bar.cc

 // Copyright 2013 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/message_center/views/message_center_button_bar.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/message_center/views/message_center_view.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 
 namespace message_center {
 
 namespace {
-const int kButtonSize = 40;
-const int kLeftPaddingWidthForNonArrows = 16;
-const int kFooterTopMargin = 6;
-const int kFooterBottomMargin = 3;
-const int kFooterLeftMargin = 4;
-const int kFooterRightMargin = 14;
+constexpr int kButtonSize = 40;
 }  // namespace
 
 // NotificationCenterButton ////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 class NotificationCenterButton : public views::ToggleImageButton {
  public:
   NotificationCenterButton(views::ButtonListener* listener,
                            int normal_id,
                            int hover_id,
                            int pressed_id,
@@ skipping 133 matching lines @@
       resource_bundle.GetImageSkiaNamed(IDR_NOTIFICATION_BUBBLE_CLOSE_PRESSED));
   AddChildView(close_bubble_button_);
 #endif
 
   SetCloseAllButtonEnabled(!settings_initially_visible);
   SetBackArrowVisible(settings_initially_visible);
   ViewVisibilityChanged();
 }
 
 void MessageCenterButtonBar::ViewVisibilityChanged() {
-  gfx::ImageSkia* settings_image =
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_NOTIFICATION_SETTINGS);
-  int image_margin = std::max(0, (kButtonSize - settings_image->width()) / 2);
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
-  layout->SetInsets(kFooterTopMargin,
-                    kFooterLeftMargin,
-                    kFooterBottomMargin,
-                    std::max(0, kFooterRightMargin - image_margin));
   views::ColumnSet* column = layout->AddColumnSet(0);
+  constexpr int kFooterLeftMargin = 4;
+  column->AddPaddingColumn(0, kFooterLeftMargin);
   if (title_arrow_->visible()) {
     // Column for the left-arrow used to back out of settings.
     column->AddColumn(views::GridLayout::LEADING,
                       views::GridLayout::CENTER,
                       0.0f,
                       views::GridLayout::FIXED,
                       kButtonSize,
                       0);
   } else {
+    constexpr int kLeftPaddingWidthForNonArrows = 16;
     column->AddPaddingColumn(0.0f, kLeftPaddingWidthForNonArrows);
   }
 
   // Column for the label "Notifications".
   column->AddColumn(views::GridLayout::LEADING,
                     views::GridLayout::CENTER,
                     0.0f,
                     views::GridLayout::USE_PREF,
                     0,
                     0);
 
   // Fills in the remaining space between "Notifications" and buttons.
+  gfx::ImageSkia* settings_image =
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_NOTIFICATION_SETTINGS);
+  const int image_margin =
+      std::max(0, (kButtonSize - settings_image->width()) / 2);
   column->AddPaddingColumn(1.0f, image_margin);
 
   // The button area column.
   column->AddColumn(views::GridLayout::LEADING,
                     views::GridLayout::CENTER,
                     0.0f,
                     views::GridLayout::USE_PREF,
                     0,
                     0);
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // The close-bubble button.
   column->AddColumn(views::GridLayout::LEADING,
                     views::GridLayout::LEADING,
                     0.0f,
                     views::GridLayout::USE_PREF,
                     0,
                     0);
 #endif
+  constexpr int kFooterRightMargin = 14;
+  const int right_margin = std::max(0, kFooterRightMargin - image_margin);
+  column->AddPaddingColumn(0, right_margin);
 
+  constexpr int kFooterTopMargin = 6;
+  layout->AddPaddingRow(0, kFooterTopMargin);
   layout->StartRow(0, 0, kButtonSize);
   if (title_arrow_->visible())
     layout->AddView(title_arrow_);
   layout->AddView(notification_label_);
   layout->AddView(button_container_);
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   layout->AddView(close_bubble_button_);
 #endif
+  constexpr int kFooterBottomMargin = 3;
+  layout->AddPaddingRow(0, kFooterBottomMargin);
 }
 
 MessageCenterButtonBar::~MessageCenterButtonBar() {}
 
 void MessageCenterButtonBar::SetSettingsAndQuietModeButtonsEnabled(
     bool enabled) {
   settings_button_->SetEnabled(enabled);
   quiet_mode_button_->SetEnabled(enabled);
 }
 
@@ skipping 56 matching lines @@
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   } else if (sender == close_bubble_button_) {
     message_center_view()->tray()->HideMessageCenterBubble();
 #endif
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace message_center