Reduce views::Border creation verbosity by promoting factory functions

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 187 matching lines @@
   add_user_ = new views::View;
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
   // Add the icon which is also the anchor for messages.
   if (UseMd()) {
     views::ImageView* icon = new views::ImageView();
     icon->SetImage(
         gfx::CreateVectorIcon(kSystemMenuNewUserIcon, kMenuIconColor));
-    icon->SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(
+    icon->SetBorder(views::CreateEmptyBorder(gfx::Insets(
         (GetTrayConstant(TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH) -
          icon->GetPreferredSize().width()) /
         2)));
     anchor_ = icon;
     add_user_->AddChildView(icon);
   } else {
-    add_user_->SetBorder(views::Border::CreateEmptyBorder(
-        0, kTrayUserTileHoverBorderInset, 0, 0));
+    add_user_->SetBorder(
+        views::CreateEmptyBorder(0, kTrayUserTileHoverBorderInset, 0, 0));
     RoundedImageView* icon =
         new RoundedImageView(kTrayRoundedBorderRadius, true);
     anchor_ = icon;
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance()
                         .GetImageNamed(IDR_AURA_UBER_TRAY_ADD_MULTIPROFILE_USER)
                         .ToImageSkia(),
                    gfx::Size(kTrayItemSize, kTrayItemSize));
     add_user_->AddChildView(icon);
   }
 
@@ skipping 28 matching lines @@
   AddUserCard(login);
 
   if (UseMd()) {
     auto layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
                                        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),
+    SetBorder(views::CreatePaddedBorder(
+        views::CreateSolidSidedBorder(0, 0, separator_width, 0,
+                                      kSeparatorColor),
         gfx::Insets(kMenuSeparatorVerticalPadding, 0,
                     kMenuSeparatorVerticalPadding - separator_width, 0)));
   }
 }
 
 UserView::~UserView() {
   RemoveAddUserMenuOption();
 }
 
 void UserView::MouseMovedOutOfHost() {
@@ skipping 126 matching lines @@
 }
 
 void UserView::AddLogoutButton(LoginStatus login) {
   const base::string16 title =
       user::GetLocalizedSignOutStringForStatus(login, true);
   auto* logout_button = CreateTrayPopupBorderlessButton(this, title);
   logout_button->SetAccessibleName(title);
   logout_button_ = logout_button;
   if (UseMd()) {
     views::View* separator = CreateVerticalSeparator();
-    separator->SetBorder(views::Border::CreateEmptyBorder(
+    separator->SetBorder(views::CreateEmptyBorder(
         gfx::Insets(0, 0, 0, kTrayPopupLabelHorizontalPadding)));
     AddChildView(separator);
   } else if (login == LoginStatus::PUBLIC) {
     // In public account mode, the logout button border has a custom color.
     std::unique_ptr<TrayPopupLabelButtonBorder> border(
         new TrayPopupLabelButtonBorder());
     border->SetPainter(false, views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
     border->SetPainter(false, views::Button::STATE_HOVERED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     border->SetPainter(false, views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     logout_button_->SetBorder(std::move(border));
   }
   AddChildView(logout_button_);
 }
 
 void UserView::AddUserCard(LoginStatus login) {
   if (UseMd())
     return AddUserCardMd(login);
 
   // Add padding around the panel.
   const int kSidePadding = kTrayPopupPaddingHorizontal;
-  SetBorder(views::Border::CreateEmptyBorder(
+  SetBorder(views::CreateEmptyBorder(
       kTrayPopupUserCardVerticalPadding, kSidePadding,
       kTrayPopupUserCardVerticalPadding, kSidePadding));
 
   views::TrayBubbleView* bubble_view =
       owner_->system_tray()->GetSystemBubble()->bubble_view();
   int max_card_width = bubble_view->GetMaximumSize().width() -
                        (2 * kSidePadding + kTrayPopupPaddingBetweenItems);
   if (logout_button_)
     max_card_width -= logout_button_->GetPreferredSize().width();
   user_card_view_ = new UserCardView(login, max_card_width, user_index_);
   // The entry is clickable when no system modal dialog is open and the multi
   // profile option is active.
   bool clickable = !WmShell::Get()->IsSystemModalWindowOpen() &&
                    IsMultiProfileSupportedAndUserActive();
   if (clickable) {
     // To allow the border to start before the icon, reduce the size before and
     // add an inset to the icon to get the spacing.
     if (!user_index_) {
-      SetBorder(views::Border::CreateEmptyBorder(
+      SetBorder(views::CreateEmptyBorder(
           kTrayPopupUserCardVerticalPadding,
           kSidePadding - kTrayUserTileHoverBorderInset,
           kTrayPopupUserCardVerticalPadding, kSidePadding));
-      user_card_view_->SetBorder(views::Border::CreateEmptyBorder(
-          0, kTrayUserTileHoverBorderInset, 0, 0));
+      user_card_view_->SetBorder(
+          views::CreateEmptyBorder(0, kTrayUserTileHoverBorderInset, 0, 0));
     }
     gfx::Insets insets = gfx::Insets(1, 1, 1, 1);
     views::View* contents_view = user_card_view_;
     if (user_index_) {
       // Since the activation border needs to be drawn around the tile, we
       // have to put the tile into another view which fills the menu panel,
       // but keeping the offsets of the content.
       contents_view = new views::View();
-      contents_view->SetBorder(views::Border::CreateEmptyBorder(
+      contents_view->SetBorder(views::CreateEmptyBorder(
           kTrayPopupUserCardVerticalPadding, kSidePadding,
           kTrayPopupUserCardVerticalPadding, kSidePadding));
       contents_view->SetLayoutManager(new views::FillLayout());
       SetBorder(nullptr);
       contents_view->AddChildView(user_card_view_);
       insets = gfx::Insets(1, 1, 1, 3);
     }
     bool highlight = !UseMd() && user_index_ == 0;
     auto* button = new ButtonFromView(contents_view, this, highlight, insets);
     user_card_view_ = button;
@@ skipping 75 matching lines @@
     // 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);
 
     views::View* container = new AddUserWidgetContents(
         base::Bind(&UserView::RemoveAddUserMenuOption, base::Unretained(this)));
-    container->SetBorder(views::Border::CreatePaddedBorder(
-        views::Border::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth,
-                                              kBackgroundColor),
+    container->SetBorder(views::CreatePaddedBorder(
+        views::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth,
+                                      kBackgroundColor),
         gfx::Insets(row_height, 0, 0, 0)));
     container->SetLayoutManager(new views::FillLayout());
     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());
@@ skipping 57 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