| Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
|
| index 4d0313028593ccf7fb1398a1c5e34f95c3b5ddb3..2d27d0a647eca4372ea5090201133fc94a4355ce 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
|
| @@ -155,9 +155,9 @@ void ToolbarButton::GetAccessibleState(ui::AXViewState* state) {
|
| state->AddStateFlag(ui::AX_STATE_HASPOPUP);
|
| }
|
|
|
| -scoped_ptr<views::LabelButtonBorder>
|
| -ToolbarButton::CreateDefaultBorder() const {
|
| - scoped_ptr<views::LabelButtonBorder> border =
|
| +std::unique_ptr<views::LabelButtonBorder> ToolbarButton::CreateDefaultBorder()
|
| + const {
|
| + std::unique_ptr<views::LabelButtonBorder> border =
|
| views::LabelButton::CreateDefaultBorder();
|
|
|
| if (ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme())
|
|
|