| Index: ui/app_list/search_box_model.h
|
| diff --git a/ui/app_list/search_box_model.h b/ui/app_list/search_box_model.h
|
| index a5a7a50ea374b9062aca02190c9526f6f5bf1763..2da22778985eb9c213a661df1610fa01f8967d9a 100644
|
| --- a/ui/app_list/search_box_model.h
|
| +++ b/ui/app_list/search_box_model.h
|
| @@ -53,7 +53,7 @@ class APP_LIST_EXPORT SearchBoxModel {
|
|
|
| // Sets/gets the properties for the button of speech recognition.
|
| void SetSpeechRecognitionButton(
|
| - scoped_ptr<SpeechButtonProperty> speech_button);
|
| + std::unique_ptr<SpeechButtonProperty> speech_button);
|
| const SpeechButtonProperty* speech_button() const {
|
| return speech_button_.get();
|
| }
|
| @@ -81,7 +81,7 @@ class APP_LIST_EXPORT SearchBoxModel {
|
|
|
| private:
|
| gfx::ImageSkia icon_;
|
| - scoped_ptr<SpeechButtonProperty> speech_button_;
|
| + std::unique_ptr<SpeechButtonProperty> speech_button_;
|
| base::string16 hint_text_;
|
| base::string16 accessible_name_;
|
| gfx::SelectionModel selection_model_;
|
|
|