Add ability to specify extra insets for a view via its border.

ui/views/border.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/border.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 119 matching lines @@
 }
 
 gfx::Insets EmptyBorder::GetInsets() const {
   return insets_;
 }
 
 gfx::Size EmptyBorder::GetMinimumSize() const {
   return gfx::Size();
 }
 
+class ExtraInsetsBorder : public Border {
+ public:
+  ExtraInsetsBorder(std::unique_ptr<Border> border, const gfx::Insets& insets);
+
+  // Overridden from Border:
+  void Paint(const View& view, gfx::Canvas* canvas) override;
+  gfx::Insets GetInsets() const override;
+  gfx::Size GetMinimumSize() const override;
+
+ private:
+  std::unique_ptr<Border> border_;
+  const gfx::Insets extra_insets_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtraInsetsBorder);
+};
+
+ExtraInsetsBorder::ExtraInsetsBorder(std::unique_ptr<Border> border,
+                                     const gfx::Insets& insets)
+    : border_(std::move(border)), extra_insets_(insets) {}
+
+void ExtraInsetsBorder::Paint(const View& view, gfx::Canvas* canvas) {
+  border_->Paint(view, canvas);
+}
+
+gfx::Insets ExtraInsetsBorder::GetInsets() const {
+  return border_->GetInsets() + extra_insets_;
+}
+
+gfx::Size ExtraInsetsBorder::GetMinimumSize() const {
+  gfx::Size size = border_->GetMinimumSize();
+  size.Enlarge(extra_insets_.width(), extra_insets_.height());
+  return size;
+}
+
 class BorderPainter : public Border {
  public:
   BorderPainter(std::unique_ptr<Painter> painter, const gfx::Insets& insets);
 
   // Overridden from Border:
   void Paint(const View& view, gfx::Canvas* canvas) override;
   gfx::Insets GetInsets() const override;
   gfx::Size GetMinimumSize() const override;
 
  private:
@@ skipping 64 matching lines @@
 std::unique_ptr<Border> Border::CreateSolidSidedBorder(int top,
                                                        int left,
                                                        int bottom,
                                                        int right,
                                                        SkColor color) {
   return base::MakeUnique<SolidSidedBorder>(
       gfx::Insets(top, left, bottom, right), color);
 }
 
 // static
+std::unique_ptr<Border> Border::CreatePaddedBorder(
+    std::unique_ptr<Border> border,
+    const gfx::Insets& insets) {
+  return base::MakeUnique<ExtraInsetsBorder>(std::move(border), insets);
+}
+
+// static
 std::unique_ptr<Border> Border::CreateBorderPainter(
     std::unique_ptr<Painter> painter,
     const gfx::Insets& insets) {
   return base::WrapUnique(new BorderPainter(std::move(painter), insets));
 }
 
 }  // namespace views