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 238 matching lines @@
   }
   // The logout button must be added before the user card so that the user card
   // can correctly calculate the remaining available width.
   // Note that only the current multiprofile user gets a button.
   if (!user_index_)
     AddLogoutButton(login);
   AddUserCard(login);
 
   if (UseMd()) {
     auto layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
-                                       kMenuExtraMarginFromLeftEdge,
-                                       kMenuSeparatorVerticalPadding, 0);
+                                       kMenuExtraMarginFromLeftEdge, 0, 0);
     SetLayoutManager(layout);
     layout->set_cross_axis_alignment(
         views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
     layout->SetFlexForView(user_card_view_, 1);
+    int separator_width = user_index_ == 0 ? kSeparatorWidth : 0;
+    SetBorder(views::Border::CreatePaddedBorder(
+        views::Border::CreateSolidSidedBorder(0, 0, separator_width, 0,
+                                              kSeparatorColor),
+        gfx::Insets(kMenuSeparatorVerticalPadding, 0,
+                    kMenuSeparatorVerticalPadding - separator_width, 0)));
   }
 }
 
 UserView::~UserView() {
   RemoveAddUserMenuOption();
 }
 
 void UserView::MouseMovedOutOfHost() {
   DCHECK(!UseMd());
   RemoveAddUserMenuOption();
@@ skipping 79 matching lines @@
       remaining_width -= kTrayPopupPaddingBetweenItems;
     }
     user_card_area.set_width(remaining_width);
     user_card_view_->SetBoundsRect(user_card_area);
     logout_button_->SetBoundsRect(logout_area);
   } else {
     user_card_view_->SetBoundsRect(contents_area);
   }
 }
 
-void UserView::OnPaintBorder(gfx::Canvas* canvas) {
-  if (!UseMd() || user_index_)
-    return;
-
-  DCHECK(!border());
-  // For the separator below this row, manually paint a border because it should
-  // be drawn *on top* of the vertical padding.
-  gfx::Rect local_bounds = GetLocalBounds();
-  local_bounds.Inset(gfx::Insets(0, 0, kSeparatorWidth, 0));
-  canvas->DrawLine(local_bounds.bottom_left(), local_bounds.bottom_right(),
-                   kHorizontalSeparatorColor);
-}
-
 void UserView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   if (sender == logout_button_) {
     WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_SIGN_OUT);
     RemoveAddUserMenuOption();
     WmShell::Get()->system_tray_delegate()->SignOut();
   } else if (sender == user_card_view_ &&
              IsMultiProfileSupportedAndUserActive()) {
     if (!user_index_) {
       ToggleAddUserMenuOption();
     } else {
@@ skipping 179 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::CreatePaddedBorder(
+        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