Reduce views::Border creation verbosity by promoting factory functions

ash/common/system/tray/special_popup_row.cc

 // Copyright (c) 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 "ash/common/system/tray/special_popup_row.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 36 matching lines @@
     views::BoxLayout* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 4, 0, 0);
     box_layout->set_main_axis_alignment(
         views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
     box_layout->set_cross_axis_alignment(
         views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
     view->SetLayoutManager(box_layout);
   } else {
     view->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
-    view->SetBorder(views::Border::CreateEmptyBorder(4, 0, 4, 5));
+    view->SetBorder(views::CreateEmptyBorder(4, 0, 4, 5));
   }
 
   return view;
 }
 
 }  // namespace
 
 SpecialPopupRow::SpecialPopupRow()
     : views_before_content_container_(nullptr),
       content_(nullptr),
       views_after_content_container_(nullptr),
       label_(nullptr) {
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    SetBorder(views::Border::CreateSolidSidedBorder(0, 0, kBorderHeight, 0,
-                                                    kBorderColor));
+    SetBorder(
+        views::CreateSolidSidedBorder(0, 0, kBorderHeight, 0, kBorderColor));
   } else {
     set_background(
         views::Background::CreateSolidBackground(kHeaderBackgroundColor));
-    SetBorder(views::Border::CreateSolidSidedBorder(kBorderHeight, 0, 0, 0,
-                                                    kBorderColor));
+    SetBorder(
+        views::CreateSolidSidedBorder(kBorderHeight, 0, 0, 0, kBorderColor));
   }
 }
 
 SpecialPopupRow::~SpecialPopupRow() {}
 
 void SpecialPopupRow::SetTextLabel(int string_id, ViewClickListener* listener) {
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     SetTextLabelMd(string_id, listener);
   else
     SetTextLabelNonMd(string_id, listener);
@@ skipping 146 matching lines @@
                                           bool add_separator) {
   if (!views_after_content_container_) {
     views_after_content_container_ = CreateViewContainer();
     AddChildView(views_after_content_container_);
   }
 
   if (add_separator) {
     views::Separator* separator =
         new views::Separator(views::Separator::VERTICAL);
     separator->SetColor(ash::kBorderDarkColor);
-    separator->SetBorder(views::Border::CreateEmptyBorder(kSeparatorInset, 0,
-                                                          kSeparatorInset, 0));
+    separator->SetBorder(
+        views::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0));
     views_after_content_container_->AddChildView(separator);
   }
 
   views_after_content_container_->AddChildView(view);
 }
 
 void SpecialPopupRow::SetTextLabelMd(int string_id,
                                      ViewClickListener* listener) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::View* container = new views::View;
@@ skipping 23 matching lines @@
   container->set_highlight_color(SkColorSetARGB(0, 0, 0, 0));
   container->set_default_color(SkColorSetARGB(0, 0, 0, 0));
   container->set_text_highlight_color(kHeaderTextColorHover);
   container->set_text_default_color(kHeaderTextColorNormal);
 
   container->AddIconAndLabel(
       *rb.GetImageNamed(IDR_AURA_UBER_TRAY_LESS).ToImageSkia(),
       rb.GetLocalizedString(string_id), true /* highlight */);
 
   container->SetBorder(
-      views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
+      views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
 
   container->SetAccessibleName(
       rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_PREVIOUS_MENU));
   SetContent(container);
 }
 
 }  // namespace ash