Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2160)

Unified Diff: ui/app_list/search_box_model.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/search/tokenized_string_char_iterator.h ('k') | ui/app_list/search_box_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ui/app_list/search/tokenized_string_char_iterator.h ('k') | ui/app_list/search_box_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698