| Index: ash/system/user/user_view.cc
|
| diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
|
| index 2a693251882b1d0520c1ed46e40e1d0b3c5ca13e..36f484a6583ef2364dcaf8c46dc2be1af2a95554 100644
|
| --- a/ash/system/user/user_view.cc
|
| +++ b/ash/system/user/user_view.cc
|
| @@ -338,7 +338,7 @@ void UserView::AddLogoutButton(user::LoginStatus login) {
|
| logout_button_ = logout_button;
|
| // In public account mode, the logout button border has a custom color.
|
| if (login == user::LOGGED_IN_PUBLIC) {
|
| - scoped_ptr<TrayPopupLabelButtonBorder> border(
|
| + std::unique_ptr<TrayPopupLabelButtonBorder> border(
|
| new TrayPopupLabelButtonBorder());
|
| border->SetPainter(false,
|
| views::Button::STATE_NORMAL,
|
|
|