Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc
diff --git a/ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc b/ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc
index 426939a656d96c4f3b30ed3ae1e2ca414d8cb50f..cd23fbd45b9dfbae7d22120b6815cdbfbd1f057f 100644
--- a/ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc
+++ b/ash/wm/caption_buttons/maximize_bubble_controller_bubble.cc
@@ -76,8 +76,8 @@ BubbleContentsView::BubbleContentsView(
const SkColor kBubbleTextColor = SK_ColorWHITE;
label_view_->SetEnabledColor(kBubbleTextColor);
const int kLabelSpacing = 4;
- label_view_->set_border(views::Border::CreateEmptyBorder(
- kLabelSpacing, 0, kLabelSpacing, 0));
+ label_view_->SetBorder(
+ views::Border::CreateEmptyBorder(kLabelSpacing, 0, kLabelSpacing, 0));
AddChildView(label_view_);
}
@@ -378,7 +378,8 @@ MaximizeBubbleControllerBubble::MaximizeBubbleControllerBubble(
bubble_widget_->non_client_view()->frame_view()->set_background(NULL);
bubble_border_ = new MaximizeBubbleBorder(this, GetAnchorView());
- GetBubbleFrameView()->SetBubbleBorder(bubble_border_);
+ GetBubbleFrameView()->SetBubbleBorder(
+ scoped_ptr<views::BubbleBorder>(bubble_border_));
GetBubbleFrameView()->set_background(NULL);
// Recalculate size with new border.

Powered by Google App Engine
This is Rietveld 408576698