ash/system/chromeos/label_tray_view.cc - Issue 145033006: views: Make View::set_border() take a scoped_ptr<>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/chromeos/label_tray_view.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:

Index: ash/system/chromeos/label_tray_view.cc

diff --git a/ash/system/chromeos/label_tray_view.cc b/ash/system/chromeos/label_tray_view.cc

index 0ae4604680e61ca05137f232d68d9f0f6bb83a97..9a57b322c4af72eeab1025dd64728779b4a249bc 100644

--- a/ash/system/chromeos/label_tray_view.cc

+++ b/ash/system/chromeos/label_tray_view.cc

@@ -48,9 +48,8 @@ views::View* LabelTrayView::CreateChildView(

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

const gfx::ImageSkia* icon = rb.GetImageSkiaNamed(icon_resource_id_);

child->AddIconAndLabel(*icon, message, gfx::Font::NORMAL);

- child->set_border(

- views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal,

- 0, kTrayPopupPaddingHorizontal));

+ child->SetBorder(views::Border::CreateEmptyBorder(

+ 0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));

child->text_label()->SetMultiLine(true);

child->text_label()->SizeToFit(kTrayNotificationContentsWidth);

} else {