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

ash/common/system/user/user_view.cc

 // Copyright 2014 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 "ash/common/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 555 matching lines @@
   if (UseMd()) {
     // Position the widget on top of the user card view (which is still in the
     // system menu). The top half of the widget will be transparent to allow
     // the active user to show through.
     gfx::Rect bounds = user_card_view_->GetBoundsInScreen();
     bounds.set_width(bounds.width() + kSeparatorWidth);
     int row_height = bounds.height();
     bounds.set_height(row_height * 2);
     add_menu_option_->SetBounds(bounds);
 
-    // This nested container is necessary to stack borders.
-    views::View* nested_container = new views::View();
-    nested_container->SetBorder(
-        views::Border::CreateEmptyBorder(row_height, 0, 0, 0));
-    nested_container->SetLayoutManager(new views::FillLayout());
-    nested_container->AddChildView(button);
-
     views::View* container = new AddUserWidgetContents(
         base::Bind(&UserView::RemoveAddUserMenuOption, base::Unretained(this)));
-    container->SetBorder(views::Border::CreateSolidSidedBorder(
-        0, 0, 0, kSeparatorWidth, kBackgroundColor));
+    container->SetBorder(views::Border::AddInteriorPadding(
+        views::Border::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth,
+                                              kBackgroundColor),
+        gfx::Insets(row_height, 0, 0, 0)));
     container->SetLayoutManager(new views::FillLayout());
-    container->AddChildView(nested_container);
+    container->AddChildView(button);
     add_menu_option_->SetContentsView(container);
   } else {
     add_menu_option_->SetOpacity(1.f);
     add_menu_option_->SetContentsView(button);
     // Position it below our user card.
     gfx::Rect bounds = user_card_view_->GetBoundsInScreen();
     bounds.set_y(bounds.y() + bounds.height());
     add_menu_option_->SetBounds(bounds);
   }
 
@@ skipping 54 matching lines @@
   focus_manager_ = nullptr;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash