| Index: ash/system/tray/tray_popup_label_button.cc
|
| diff --git a/ash/system/tray/tray_popup_label_button.cc b/ash/system/tray/tray_popup_label_button.cc
|
| index 4d4ff84620c2ebf9dbee0e62b99b7fecaef750a8..5fbeea1fceccbbe807ca335c76a4048064bcaf15 100644
|
| --- a/ash/system/tray/tray_popup_label_button.cc
|
| +++ b/ash/system/tray/tray_popup_label_button.cc
|
| @@ -15,7 +15,7 @@ namespace ash {
|
| TrayPopupLabelButton::TrayPopupLabelButton(views::ButtonListener* listener,
|
| const base::string16& text)
|
| : views::LabelButton(listener, text) {
|
| - SetBorder(scoped_ptr<views::Border>(new TrayPopupLabelButtonBorder));
|
| + SetBorder(std::unique_ptr<views::Border>(new TrayPopupLabelButtonBorder));
|
| SetFocusable(true);
|
| set_request_focus_on_press(false);
|
| set_animate_on_state_change(false);
|
|
|