views: Make View::set_border() take a scoped_ptr<>.

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
@@ skipping 110 matching lines @@
       subtext, 1, 1,
       views::GridLayout::FILL, views::GridLayout::LEADING,
       dialog_content_width, subtext->GetHeightForWidth(dialog_content_width));
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Scrollable area for checkboxes.
   ScrollableView* scroll_container = new ScrollableView();
   scroll_container->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0,
       views::kRelatedControlSmallVerticalSpacing));
-  scroll_container->set_border(views::Border::CreateEmptyBorder(
-      views::kRelatedControlVerticalSpacing,
-      0,
-      views::kRelatedControlVerticalSpacing,
-      0));
+  scroll_container->SetBorder(
+      views::Border::CreateEmptyBorder(views::kRelatedControlVerticalSpacing,
+                                       0,
+                                       views::kRelatedControlVerticalSpacing,
+                                       0));
 
   // Add attached galleries checkboxes.
   checkbox_map_.clear();
   new_checkbox_map_.clear();
   GalleryPermissionsVector permissions = controller_->AttachedPermissions();
   for (GalleryPermissionsVector::const_iterator iter = permissions.begin();
        iter != permissions.end(); ++iter) {
     int spacing = 0;
     if (iter + 1 == permissions.end())
       spacing = views::kRelatedControlSmallVerticalSpacing;
     AddOrUpdateGallery(iter->pref_info, iter->allowed, scroll_container,
                        spacing);
   }
 
   GalleryPermissionsVector unattached_permissions =
       controller_->UnattachedPermissions();
 
   if (!unattached_permissions.empty()) {
     // Separator line.
     views::Separator* separator = new views::Separator(
         views::Separator::HORIZONTAL);
     scroll_container->AddChildView(separator);
 
     // Unattached locations section.
     views::Label* unattached_text = new views::Label(
         controller_->GetUnattachedLocationsHeader());
     unattached_text->SetMultiLine(true);
     unattached_text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    unattached_text->set_border(views::Border::CreateEmptyBorder(
-        views::kRelatedControlVerticalSpacing,
-        views::kPanelHorizMargin,
-        views::kRelatedControlVerticalSpacing,
-        0));
+    unattached_text->SetBorder(
+        views::Border::CreateEmptyBorder(views::kRelatedControlVerticalSpacing,
+                                         views::kPanelHorizMargin,
+                                         views::kRelatedControlVerticalSpacing,
+                                         0));
     scroll_container->AddChildView(unattached_text);
 
     // Add unattached galleries checkboxes.
     for (GalleryPermissionsVector::const_iterator iter =
              unattached_permissions.begin();
          iter != unattached_permissions.end(); ++iter) {
       AddOrUpdateGallery(iter->pref_info, iter->allowed, scroll_container, 0);
     }
   }
 
@@ skipping 46 matching lines @@
   checkbox->set_listener(this);
   if (gallery.pref_id != kInvalidMediaGalleryPrefId)
     checkbox->set_context_menu_controller(this);
   checkbox->SetTooltipText(tooltip_text);
   views::Label* secondary_text = new views::Label(details);
   if (gallery.pref_id != kInvalidMediaGalleryPrefId)
     secondary_text->set_context_menu_controller(this);
   secondary_text->SetTooltipText(tooltip_text);
   secondary_text->SetEnabledColor(kDeemphasizedTextColor);
   secondary_text->SetTooltipText(tooltip_text);
-  secondary_text->set_border(views::Border::CreateEmptyBorder(
+  secondary_text->SetBorder(views::Border::CreateEmptyBorder(
       0,
       views::kRelatedControlSmallHorizontalSpacing,
       0,
       views::kRelatedControlSmallHorizontalSpacing));
 
   views::View* checkbox_view = new views::View();
   if (gallery.pref_id != kInvalidMediaGalleryPrefId)
     checkbox_view->set_context_menu_controller(this);
-  checkbox_view->set_border(views::Border::CreateEmptyBorder(
-      0,
-      views::kPanelHorizMargin,
-      trailing_vertical_space,
-      0));
+  checkbox_view->SetBorder(views::Border::CreateEmptyBorder(
+      0, views::kPanelHorizMargin, trailing_vertical_space, 0));
   checkbox_view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
   checkbox_view->AddChildView(checkbox);
   checkbox_view->AddChildView(secondary_text);
 
   container->AddChildView(checkbox_view);
 
   checkbox->SetChecked(permitted);
   if (gallery.pref_id != kInvalidMediaGalleryPrefId)
     checkbox_map_[gallery.pref_id] = checkbox;
@@ skipping 124 matching lines @@
   }
 }
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }