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

Unified Diff: services/catalog/reader.h

Issue 1910673002: Convert //services from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « services/catalog/instance.cc ('k') | services/catalog/reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/reader.h
diff --git a/services/catalog/reader.h b/services/catalog/reader.h
index 0bc8e644966d19b43df6fb6523d2519fb0a75bea..322057bbd74ff25f5b7696bbf96c024ec49f6160 100644
--- a/services/catalog/reader.h
+++ b/services/catalog/reader.h
@@ -5,10 +5,11 @@
#ifndef SERVICES_CATALOG_READER_H_
#define SERVICES_CATALOG_READER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "services/catalog/types.h"
#include "services/shell/public/interfaces/shell_resolver.mojom.h"
@@ -25,9 +26,8 @@ class ManifestProvider;
// Responsible for loading manifests & building the Entry data structures.
class Reader {
public:
- using ReadManifestCallback =
- base::Callback<void(scoped_ptr<Entry>)>;
- using CreateEntryForNameCallback =
+ using ReadManifestCallback = base::Callback<void(std::unique_ptr<Entry>)>;
+ using CreateEntryForNameCallback =
base::Callback<void(shell::mojom::ResolveResultPtr)>;
Reader(base::TaskRunner* file_task_runner,
@@ -50,7 +50,7 @@ class Reader {
private:
void OnReadManifest(EntryCache* cache,
const CreateEntryForNameCallback& entry_created_callback,
- scoped_ptr<Entry> entry);
+ std::unique_ptr<Entry> entry);
base::FilePath system_package_dir_;
base::TaskRunner* file_task_runner_;
« no previous file with comments | « services/catalog/instance.cc ('k') | services/catalog/reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698