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

Unified Diff: ui/app_list/search/dictionary_data_store.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/pagination_model.h ('k') | ui/app_list/search/dictionary_data_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/search/dictionary_data_store.h
diff --git a/ui/app_list/search/dictionary_data_store.h b/ui/app_list/search/dictionary_data_store.h
index 1c7a19252fd1dbb63451dc133521bf56e6e996e6..4b9739b358ea4a5cce05935d9e93b2816d60e63b 100644
--- a/ui/app_list/search/dictionary_data_store.h
+++ b/ui/app_list/search/dictionary_data_store.h
@@ -5,6 +5,7 @@
#ifndef UI_APP_LIST_SEARCH_DICTIONARY_DATA_STORE_H_
#define UI_APP_LIST_SEARCH_DICTIONARY_DATA_STORE_H_
+#include <memory>
#include <string>
#include <vector>
@@ -13,7 +14,6 @@
#include "base/files/important_file_writer.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/app_list/app_list_export.h"
namespace base {
@@ -29,7 +29,7 @@ class APP_LIST_EXPORT DictionaryDataStore
: public base::RefCountedThreadSafe<DictionaryDataStore>,
public base::ImportantFileWriter::DataSerializer {
public:
- typedef base::Callback<void(scoped_ptr<base::DictionaryValue>)>
+ typedef base::Callback<void(std::unique_ptr<base::DictionaryValue>)>
OnLoadedCallback;
typedef base::Closure OnFlushedCallback;
@@ -57,17 +57,17 @@ class APP_LIST_EXPORT DictionaryDataStore
~DictionaryDataStore() override;
// Reads data from backing file.
- scoped_ptr<base::DictionaryValue> LoadOnBlockingPool();
+ std::unique_ptr<base::DictionaryValue> LoadOnBlockingPool();
// ImportantFileWriter::DataSerializer overrides:
bool SerializeData(std::string* data) override;
base::FilePath data_file_;
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
- scoped_ptr<base::ImportantFileWriter> writer_;
+ std::unique_ptr<base::ImportantFileWriter> writer_;
// Cached JSON dictionary to serve read and incremental change calls.
- scoped_ptr<base::DictionaryValue> cached_dict_;
+ std::unique_ptr<base::DictionaryValue> cached_dict_;
base::SequencedWorkerPool* worker_pool_;
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | ui/app_list/search/dictionary_data_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698