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

Unified Diff: ash/system/tray/tray_utils.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Further renaming 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/system/tray/tray_utils.cc
diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc
index a545ed1ba28ac16dd8f6eee0f103f3319f64df4d..b7fa924e6e06cf6f5f52eb4c31630d86de331743 100644
--- a/ash/system/tray/tray_utils.cc
+++ b/ash/system/tray/tray_utils.cc
@@ -31,11 +31,11 @@ void SetTrayImageItemBorder(views::View* tray_view,
ShelfAlignment alignment) {
if (alignment == SHELF_ALIGNMENT_BOTTOM ||
alignment == SHELF_ALIGNMENT_TOP) {
- tray_view->set_border(views::Border::CreateEmptyBorder(
+ tray_view->SetBorder(views::Border::CreateEmptyBorder(
0, kTrayImageItemHorizontalPaddingBottomAlignment,
0, kTrayImageItemHorizontalPaddingBottomAlignment));
} else {
- tray_view->set_border(views::Border::CreateEmptyBorder(
+ tray_view->SetBorder(views::Border::CreateEmptyBorder(
kTrayImageItemVerticalPaddingVerticalAlignment,
kTrayImageItemHorizontalPaddingVerticalAlignment,
kTrayImageItemVerticalPaddingVerticalAlignment,
@@ -47,7 +47,7 @@ void SetTrayLabelItemBorder(TrayItemView* tray_view,
ShelfAlignment alignment) {
if (alignment == SHELF_ALIGNMENT_BOTTOM ||
alignment == SHELF_ALIGNMENT_TOP) {
- tray_view->set_border(views::Border::CreateEmptyBorder(
+ tray_view->SetBorder(views::Border::CreateEmptyBorder(
0, kTrayLabelItemHorizontalPaddingBottomAlignment,
0, kTrayLabelItemHorizontalPaddingBottomAlignment));
} else {
@@ -55,7 +55,7 @@ void SetTrayLabelItemBorder(TrayItemView* tray_view,
int horizontal_padding = std::max(0,
(tray_view->GetPreferredSize().width() -
tray_view->label()->GetPreferredSize().width()) / 2);
- tray_view->set_border(views::Border::CreateEmptyBorder(
+ tray_view->SetBorder(views::Border::CreateEmptyBorder(
kTrayLabelItemVerticalPaddingVerticalAlignment,
horizontal_padding,
kTrayLabelItemVerticalPaddingVerticalAlignment,

Powered by Google App Engine
This is Rietveld 408576698