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

Unified Diff: ash/shell/app_list.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/shell.cc ('k') | ash/shell/content/client/shell_browser_main_parts.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/app_list.cc
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index a85e4d1f870f6411ccc789f72aee4e1719d6c067..66e4e7203735eacc08050ce4efde048bdecf45ee 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
#include <string>
#include <utility>
#include <vector>
@@ -125,7 +126,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 +194,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 +218,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 +358,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_;
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/content/client/shell_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698