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

ash/ime/candidate_window_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/ime/candidate_window_view.h"
 
 #include <string>
 
 #include "ash/ime/candidate_view.h"
 #include "ash/ime/candidate_window_constants.h"
@@ skipping 79 matching lines @@
   enum BorderPosition {
     TOP,
     BOTTOM
   };
 
   // Specify the alignment and initialize the control.
   InformationTextArea(gfx::HorizontalAlignment align, int min_width)
       : min_width_(min_width) {
     label_ = new views::Label;
     label_->SetHorizontalAlignment(align);
-    label_->set_border(views::Border::CreateEmptyBorder(2, 2, 2, 4));
+    label_->SetBorder(views::Border::CreateEmptyBorder(2, 2, 2, 4));
 
     SetLayoutManager(new views::FillLayout());
     AddChildView(label_);
     set_background(views::Background::CreateSolidBackground(
         color_utils::AlphaBlend(SK_ColorBLACK,
                                 GetNativeTheme()->GetSystemColor(
                                     ui::NativeTheme::kColorId_WindowBackground),
                                 0x10)));
   }
 
   // Sets the text alignment.
   void SetAlignment(gfx::HorizontalAlignment alignment) {
     label_->SetHorizontalAlignment(alignment);
   }
 
   // Sets the displayed text.
   void SetText(const std::string& utf8_text) {
     label_->SetText(base::UTF8ToUTF16(utf8_text));
   }
 
   // Sets the border thickness for top/bottom.
-  void SetBorder(BorderPosition position) {
-    set_border(views::Border::CreateSolidSidedBorder(
-        (position == TOP) ? 1 : 0, 0, (position == BOTTOM) ? 1 : 0, 0,
+  void SetBorderFromPosition(BorderPosition position) {
+    SetBorder(views::Border::CreateSolidSidedBorder(
+        (position == TOP) ? 1 : 0,
+        0,
+        (position == BOTTOM) ? 1 : 0,
+        0,
         GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_MenuBorderColor)));
   }
 
  protected:
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = views::View::GetPreferredSize();
     size.SetToMax(gfx::Size(min_width_, 0));
     return size;
   }
@@ skipping 11 matching lines @@
       should_show_upper_side_(false),
       was_candidate_window_open_(false) {
   set_parent_window(parent);
   set_margins(gfx::Insets());
 
   // Set the background and the border of the view.
   ui::NativeTheme* theme = GetNativeTheme();
   set_background(
       views::Background::CreateSolidBackground(theme->GetSystemColor(
           ui::NativeTheme::kColorId_WindowBackground)));
-  set_border(views::Border::CreateSolidBorder(
+  SetBorder(views::Border::CreateSolidBorder(
       1, theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBorderColor)));
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   auxiliary_text_ = new InformationTextArea(gfx::ALIGN_RIGHT, 0);
   preedit_ = new InformationTextArea(gfx::ALIGN_LEFT, kMinPreeditAreaWidth);
   candidate_area_ = new views::View;
   auxiliary_text_->SetVisible(false);
   preedit_->SetVisible(false);
   candidate_area_->SetVisible(false);
-  preedit_->SetBorder(InformationTextArea::BOTTOM);
+  preedit_->SetBorderFromPosition(InformationTextArea::BOTTOM);
   if (candidate_window_.orientation() == ui::CandidateWindow::VERTICAL) {
     AddChildView(preedit_);
     AddChildView(candidate_area_);
     AddChildView(auxiliary_text_);
-    auxiliary_text_->SetBorder(InformationTextArea::TOP);
+    auxiliary_text_->SetBorderFromPosition(InformationTextArea::TOP);
     candidate_area_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 0));
   } else {
     AddChildView(preedit_);
     AddChildView(auxiliary_text_);
     AddChildView(candidate_area_);
     auxiliary_text_->SetAlignment(gfx::ALIGN_LEFT);
-    auxiliary_text_->SetBorder(InformationTextArea::BOTTOM);
+    auxiliary_text_->SetBorderFromPosition(InformationTextArea::BOTTOM);
     candidate_area_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0));
   }
 }
 
 CandidateWindowView::~CandidateWindowView() {
 }
 
 views::Widget* CandidateWindowView::InitWidget() {
   views::Widget* widget = BubbleDelegateView::CreateBubble(this);
 
   views::corewm::SetWindowVisibilityAnimationType(
       widget->GetNativeView(),
       views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 
-  GetBubbleFrameView()->SetBubbleBorder(
-      new CandidateWindowBorder(parent_window()));
+  GetBubbleFrameView()->SetBubbleBorder(scoped_ptr<views::BubbleBorder>(
+      new CandidateWindowBorder(parent_window())));
   return widget;
 }
 
 void CandidateWindowView::UpdateVisibility() {
   if (candidate_area_->visible() || auxiliary_text_->visible() ||
       preedit_->visible()) {
     SizeToContents();
   } else {
     GetWidget()->Close();
   }
@@ skipping 28 matching lines @@
 void CandidateWindowView::UpdateCandidates(
     const ui::CandidateWindow& new_candidate_window) {
   // Updating the candidate views is expensive. We'll skip this if possible.
   if (!candidate_window_.IsEqual(new_candidate_window)) {
     if (candidate_window_.orientation() != new_candidate_window.orientation()) {
       // If the new layout is vertical, the aux text should appear at the
       // bottom. If horizontal, it should appear between preedit and candidates.
       if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
         ReorderChildView(auxiliary_text_, -1);
         auxiliary_text_->SetAlignment(gfx::ALIGN_RIGHT);
-        auxiliary_text_->SetBorder(InformationTextArea::TOP);
+        auxiliary_text_->SetBorderFromPosition(InformationTextArea::TOP);
         candidate_area_->SetLayoutManager(new views::BoxLayout(
             views::BoxLayout::kVertical, 0, 0, 0));
       } else {
         ReorderChildView(auxiliary_text_, 1);
         auxiliary_text_->SetAlignment(gfx::ALIGN_LEFT);
-        auxiliary_text_->SetBorder(InformationTextArea::BOTTOM);
+        auxiliary_text_->SetBorderFromPosition(InformationTextArea::BOTTOM);
         candidate_area_->SetLayoutManager(new views::BoxLayout(
             views::BoxLayout::kHorizontal, 0, 0, 0));
       }
     }
 
     // Initialize candidate views if necessary.
     MaybeInitializeCandidateViews(new_candidate_window);
 
     should_show_at_composition_head_
         = new_candidate_window.show_window_at_composition();
@@ skipping 132 matching lines @@
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     if (sender == candidate_views_[i]) {
       FOR_EACH_OBSERVER(Observer, observers_, OnCandidateCommitted(i));
       return;
     }
   }
 }
 
 }  // namespace ime
 }  // namespace ash