Index: ash/shell/app_list.cc |
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc |
index a85e4d1f870f6411ccc789f72aee4e1719d6c067..b3659459c18243991c20cb128290384ac2d1337b 100644 |
--- a/ash/shell/app_list.cc |
+++ b/ash/shell/app_list.cc |
@@ -125,7 +125,7 @@ class WindowTypeShelfItem : public app_list::AppListItem { |
case EXAMPLES_WINDOW: { |
views::examples::ShowExamplesWindow( |
views::examples::QUIT_ON_CLOSE, NULL, |
- scoped_ptr<ScopedVector<views::examples::ExampleBase>>()); |
+ std::unique_ptr<ScopedVector<views::examples::ExampleBase>>()); |
break; |
} |
default: |
@@ -193,8 +193,8 @@ class ExampleSearchResult : public app_list::SearchResult { |
WindowTypeShelfItem::Type type() const { return type_; } |
// app_list::SearchResult: |
- scoped_ptr<SearchResult> Duplicate() const override { |
- return scoped_ptr<SearchResult>(); |
+ std::unique_ptr<SearchResult> Duplicate() const override { |
+ return std::unique_ptr<SearchResult>(); |
} |
private: |
@@ -217,7 +217,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { |
WindowTypeShelfItem::Type type = |
static_cast<WindowTypeShelfItem::Type>(i); |
std::string id = base::IntToString(i); |
- scoped_ptr<WindowTypeShelfItem> shelf_item( |
+ std::unique_ptr<WindowTypeShelfItem> shelf_item( |
new WindowTypeShelfItem(id, type)); |
model_->AddItem(std::move(shelf_item)); |
} |
@@ -357,7 +357,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { |
bool IsSpeechRecognitionEnabled() override { return false; } |
- scoped_ptr<app_list::AppListModel> model_; |
+ std::unique_ptr<app_list::AppListModel> model_; |
app_list::SpeechUIModel speech_ui_; |
Users users_; |