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

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: 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
« no previous file with comments | « ash/system/tray/tray_popup_label_button.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..52fa917d93681641e1e841c94d5b7b7dc97f65b1 100644
--- a/ash/system/tray/tray_utils.cc
+++ b/ash/system/tray/tray_utils.cc
@@ -31,11 +31,13 @@ void SetTrayImageItemBorder(views::View* tray_view,
ShelfAlignment alignment) {
if (alignment == SHELF_ALIGNMENT_BOTTOM ||
alignment == SHELF_ALIGNMENT_TOP) {
- tray_view->set_border(views::Border::CreateEmptyBorder(
- 0, kTrayImageItemHorizontalPaddingBottomAlignment,
- 0, kTrayImageItemHorizontalPaddingBottomAlignment));
+ 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,15 +49,17 @@ void SetTrayLabelItemBorder(TrayItemView* tray_view,
ShelfAlignment alignment) {
if (alignment == SHELF_ALIGNMENT_BOTTOM ||
alignment == SHELF_ALIGNMENT_TOP) {
- tray_view->set_border(views::Border::CreateEmptyBorder(
- 0, kTrayLabelItemHorizontalPaddingBottomAlignment,
- 0, kTrayLabelItemHorizontalPaddingBottomAlignment));
+ tray_view->SetBorder(views::Border::CreateEmptyBorder(
+ 0,
+ kTrayLabelItemHorizontalPaddingBottomAlignment,
+ 0,
+ kTrayLabelItemHorizontalPaddingBottomAlignment));
} else {
// Center the label for vertical launcher alignment.
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,
« no previous file with comments | « ash/system/tray/tray_popup_label_button.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698