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

ash/ime/infolist_window.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/ime/infolist_window.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ime/candidate_window_constants.h"
@@ skipping 102 matching lines @@
 InfolistEntryView::InfolistEntryView(const ui::InfolistEntry& entry,
                                      const gfx::FontList& title_font,
                                      const gfx::FontList& description_font)
     : entry_(entry) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   title_label_ = new views::Label(entry.title);
   title_label_->SetPosition(gfx::Point(0, 0));
   title_label_->SetFontList(title_font);
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label_->set_border(
-      views::Border::CreateEmptyBorder(4, 7, 2, 4));
+  title_label_->SetBorder(views::Border::CreateEmptyBorder(4, 7, 2, 4));
 
   description_label_ = new views::Label(entry.body);
   description_label_->SetPosition(gfx::Point(0, 0));
   description_label_->SetFontList(description_font);
   description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   description_label_->SetMultiLine(true);
   description_label_->SizeToFit(kInfolistEntryWidth);
-  description_label_->set_border(
-      views::Border::CreateEmptyBorder(2, 17, 4, 4));
+  description_label_->SetBorder(views::Border::CreateEmptyBorder(2, 17, 4, 4));
   AddChildView(title_label_);
   AddChildView(description_label_);
   UpdateBackground();
 }
 
 InfolistEntryView::~InfolistEntryView() {}
 
 void InfolistEntryView::SetEntry(const ui::InfolistEntry& entry) {
   if (entry_ == entry)
     return;
 
   entry_ = entry;
   title_label_->SetText(entry_.title);
   description_label_->SetText(entry_.body);
   UpdateBackground();
 }
 
 gfx::Size InfolistEntryView::GetPreferredSize() {
   return gfx::Size(kInfolistEntryWidth, GetHeightForWidth(kInfolistEntryWidth));
 }
 
 void InfolistEntryView::UpdateBackground() {
   if (entry_.highlighted) {
     set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
-    set_border(
-        views::Border::CreateSolidBorder(1, GetNativeTheme()->GetSystemColor(
+    SetBorder(views::Border::CreateSolidBorder(
+        1,
+        GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_FocusedBorderColor)));
   } else {
     set_background(NULL);
-    set_border(views::Border::CreateEmptyBorder(1, 1, 1, 1));
+    SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
   }
   SchedulePaint();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // InfolistWindow
 
 InfolistWindow::InfolistWindow(views::View* candidate_window,
                                const std::vector<ui::InfolistEntry>& entries)
     : views::BubbleDelegateView(candidate_window, views::BubbleBorder::NONE),
       title_font_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 15)),
       description_font_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 11)) {
   set_move_with_anchor(true);
   set_margins(gfx::Insets());
 
   set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_WindowBackground)));
-  set_border(
-      views::Border::CreateSolidBorder(1, GetNativeTheme()->GetSystemColor(
+  SetBorder(views::Border::CreateSolidBorder(
+      1,
+      GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_MenuBorderColor)));
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   views::Label* caption_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_ASH_IME_INFOLIST_WINDOW_TITLE));
   caption_label->SetFontList(
       caption_label->font_list().DeriveFontList(kFontSizeDelta - 2));
   caption_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   caption_label->SetEnabledColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  caption_label->set_border(views::Border::CreateEmptyBorder(2, 2, 2, 2));
+  caption_label->SetBorder(views::Border::CreateEmptyBorder(2, 2, 2, 2));
   caption_label->set_background(views::Background::CreateSolidBackground(
       color_utils::AlphaBlend(SK_ColorBLACK,
                               GetNativeTheme()->GetSystemColor(
                                   ui::NativeTheme::kColorId_WindowBackground),
                               0x10)));
 
   AddChildView(caption_label);
 
   for (size_t i = 0; i < entries.size(); ++i) {
     entry_views_.push_back(
         new InfolistEntryView(entries[i], title_font_, description_font_));
     AddChildView(entry_views_.back());
   }
 }
 
 InfolistWindow::~InfolistWindow() {
 }
 
 void InfolistWindow::InitWidget() {
   views::Widget* widget = views::BubbleDelegateView::CreateBubble(this);
   views::corewm::SetWindowVisibilityAnimationType(
       widget->GetNativeView(),
       views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 
   // BubbleFrameView will be initialized through CreateBubble.
-  GetBubbleFrameView()->SetBubbleBorder(new InfolistBorder());
+  GetBubbleFrameView()->SetBubbleBorder(
+      scoped_ptr<views::BubbleBorder>(new InfolistBorder()));
   SizeToContents();
 }
 
 void InfolistWindow::Relayout(const std::vector<ui::InfolistEntry>& entries) {
   size_t i = 0;
   for (; i < entries.size(); ++i) {
     if (i < entry_views_.size()) {
       entry_views_[i]->SetEntry(entries[i]);
     } else {
       InfolistEntryView* new_entry = new InfolistEntryView(
@@ skipping 39 matching lines @@
   show_hide_timer_.Stop();
   GetWidget()->Close();
 }
 
 void InfolistWindow::WindowClosing() {
   show_hide_timer_.Stop();
 }
 
 }  // namespace ime
 }  // namespace ash