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

Unified Diff: ash/shelf/shelf_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index 67df9fb6436dbcd5025ec82e9dd0202df03fec67..f3d840e2f5a24d8687aadb01a8ec98ee7b7f7bfd 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -905,7 +905,7 @@ void ShelfView::AnimateToIdealBounds() {
// Now that the item animation starts, we have to make sure that the
// padding of the first gets properly transferred to the new first item.
if (i && view->border())
- view->set_border(NULL);
+ view->SetBorder(views::Border::NullBorder());
else if (!i && !view->border())
UpdateFirstButtonPadding();
}
@@ -1314,7 +1314,7 @@ void ShelfView::UpdateFirstButtonPadding() {
// inset act as the button's padding. This is only needed on button creation
// and when shelf alignment changes.
if (view_model_->view_size() > 0) {
- view_model_->view_at(0)->set_border(views::Border::CreateEmptyBorder(
+ view_model_->view_at(0)->SetBorder(views::Border::CreateEmptyBorder(
layout_manager_->PrimaryAxisValue(0, leading_inset_),
layout_manager_->PrimaryAxisValue(leading_inset_, 0),
0,
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698