Reduce views::Border creation verbosity by promoting factory functions

ui/message_center/views/notifier_settings_view.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 "ui/message_center/views/notifier_settings_view.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 256 matching lines @@
         rb.GetImageSkiaNamed(IDR_NOTIFICATION_ADVANCED_SETTINGS_HOVER));
     learn_more_->SetImage(
         views::Button::STATE_PRESSED,
         rb.GetImageSkiaNamed(IDR_NOTIFICATION_ADVANCED_SETTINGS_PRESSED));
     learn_more_->SetState(views::Button::STATE_NORMAL);
     int learn_more_border_width = (kLearnMoreTargetWidth - kLearnMoreSize) / 2;
     int learn_more_border_height =
         (kLearnMoreTargetHeight - kLearnMoreSize) / 2;
     // The image itself is quite small, this large invisible border creates a
     // much bigger click target.
-    learn_more_->SetBorder(
-        views::Border::CreateEmptyBorder(learn_more_border_height,
-                                         learn_more_border_width,
-                                         learn_more_border_height,
-                                         learn_more_border_width));
+    learn_more_->SetBorder(views::CreateEmptyBorder(
+        learn_more_border_height, learn_more_border_width,
+        learn_more_border_height, learn_more_border_width));
     learn_more_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                    views::ImageButton::ALIGN_MIDDLE);
   }
 
   UpdateIconImage(notifier_->icon);
 }
 
 NotifierSettingsView::NotifierButton::~NotifierButton() {
 }
 
@@ skipping 138 matching lines @@
       views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
   SetPaintToLayer(true);
 
   title_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL),
       ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::MediumFont));
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label_->SetMultiLine(true);
   title_label_->SetBorder(
-      views::Border::CreateEmptyBorder(kComputedTitleTopMargin,
-                                       kTitleMargin,
-                                       kComputedTitleBottomMargin,
-                                       kTitleMargin));
+      views::CreateEmptyBorder(kComputedTitleTopMargin, kTitleMargin,
+                               kComputedTitleBottomMargin, kTitleMargin));
 
   AddChildView(title_label_);
 
   scroller_ = new views::ScrollView();
   scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false));
   AddChildView(scroller_);
 
   std::vector<Notifier*> notifiers;
   if (provider_)
     provider_->GetNotifierList(&notifiers);
@@ skipping 47 matching lines @@
       views::BoxLayout::kVertical, 0, 0, kComputedTitleElementSpacing));
 
   bool need_account_switcher =
       provider_ && provider_->GetNotifierGroupCount() > 1;
   int top_label_resource_id =
       need_account_switcher ? IDS_MESSAGE_CENTER_SETTINGS_DESCRIPTION_MULTIUSER
                             : IDS_MESSAGE_CENTER_SETTINGS_DIALOG_DESCRIPTION;
 
   views::Label* top_label =
       new views::Label(l10n_util::GetStringUTF16(top_label_resource_id));
-  top_label->SetBorder(views::Border::CreateEmptyBorder(
+  top_label->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(0, kTitleMargin - settings::kHorizontalMargin)));
   top_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   top_label->SetMultiLine(true);
 
   contents_title_view->AddChildView(top_label);
 
   if (need_account_switcher) {
     const NotifierGroup& active_group = provider_->GetActiveNotifierGroup();
     base::string16 notifier_group_text = active_group.login_info.empty() ?
         active_group.name : active_group.login_info;
     notifier_group_model_.reset(new NotifierGroupComboboxModel(provider_));
     notifier_group_combobox_ = new views::Combobox(notifier_group_model_.get());
     notifier_group_combobox_->set_listener(this);
 
     // Move the combobox over enough to align with the checkboxes.
     views::View* combobox_spacer = new views::View();
     combobox_spacer->SetLayoutManager(new views::FillLayout());
     int padding = views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
                       views::LabelButton::STYLE_TEXTBUTTON)
                       .left() -
                   notifier_group_combobox_->border()->GetInsets().left();
-    combobox_spacer->SetBorder(
-        views::Border::CreateEmptyBorder(0, padding, 0, 0));
+    combobox_spacer->SetBorder(views::CreateEmptyBorder(0, padding, 0, 0));
     combobox_spacer->AddChildView(notifier_group_combobox_);
 
     contents_title_view->AddChildView(combobox_spacer);
   }
 
   contents_view->AddChildView(contents_title_view);
 
   size_t notifier_count = notifiers.size();
   for (size_t i = 0; i < notifier_count; ++i) {
     NotifierButton* button = new NotifierButton(provider_, notifiers[i], this);
     EntryView* entry = new EntryView(button);
 
     // This code emulates separators using borders.  We will create an invisible
     // border on the last notifier, as the spec leaves a space for it.
     std::unique_ptr<views::Border> entry_border;
     if (i == notifier_count - 1) {
-      entry_border = views::Border::CreateEmptyBorder(
-          0, 0, settings::kEntrySeparatorHeight, 0);
+      entry_border =
+          views::CreateEmptyBorder(0, 0, settings::kEntrySeparatorHeight, 0);
     } else {
       entry_border =
-          views::Border::CreateSolidSidedBorder(0,
-                                                0,
-                                                settings::kEntrySeparatorHeight,
-                                                0,
-                                                settings::kEntrySeparatorColor);
+          views::CreateSolidSidedBorder(0, 0, settings::kEntrySeparatorHeight,
+                                        0, settings::kEntrySeparatorColor);
     }
     entry->SetBorder(std::move(entry_border));
     entry->SetFocusBehavior(FocusBehavior::ALWAYS);
     contents_view->AddChildView(entry);
     buttons_.insert(button);
   }
 
   scroller_->SetContents(contents_view);
 
   contents_view->SetBoundsRect(gfx::Rect(contents_view->GetPreferredSize()));
@@ skipping 64 matching lines @@
     provider_->SetNotifierEnabled((*iter)->notifier(), (*iter)->checked());
 }
 
 void NotifierSettingsView::OnPerformAction(views::Combobox* combobox) {
   provider_->SwitchToNotifierGroup(combobox->selected_index());
   MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
   center_view->OnSettingsChanged();
 }
 
 }  // namespace message_center