Index: ui/app_list/views/speech_view.cc |
diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc |
index d0679ec06b8c3caddaa4a393a9cb4c891eed7616..7cb354aa659e896967d3684180000718a9501ffb 100644 |
--- a/ui/app_list/views/speech_view.cc |
+++ b/ui/app_list/views/speech_view.cc |
@@ -114,7 +114,7 @@ bool MicButton::GetHitTestMask(gfx::Path* mask) const { |
SpeechView::SpeechView(AppListViewDelegate* delegate) |
: delegate_(delegate), |
logo_(NULL) { |
- SetBorder(scoped_ptr<views::Border>( |
+ SetBorder(std::unique_ptr<views::Border>( |
new views::ShadowBorder(GetShadowForZHeight(1)))); |
// To keep the painting order of the border and the background, this class |
@@ -138,8 +138,8 @@ SpeechView::SpeechView(AppListViewDelegate* delegate) |
MicButton* mic_button = new MicButton(this); |
mic_button_ = mic_button; |
container->AddChildView(mic_button_); |
- mic_button_->SetEventTargeter( |
- scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(mic_button))); |
+ mic_button_->SetEventTargeter(std::unique_ptr<views::ViewTargeter>( |
+ new views::ViewTargeter(mic_button))); |
// TODO(mukai): use BoundedLabel to cap 2 lines. |
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |