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

Unified Diff: ui/app_list/search/history_data.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/history.cc ('k') | ui/app_list/search/history_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/search/history_data.h
diff --git a/ui/app_list/search/history_data.h b/ui/app_list/search/history_data.h
index 7c5cc49d72554f1a731fae05d600c5c182eefa7a..9f3e3d84771627f6922c3007488fcd700b592c55 100644
--- a/ui/app_list/search/history_data.h
+++ b/ui/app_list/search/history_data.h
@@ -9,10 +9,10 @@
#include <deque>
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
@@ -68,7 +68,7 @@ class APP_LIST_EXPORT HistoryData : public base::SupportsWeakPtr<HistoryData> {
// Gets all known search results that were launched using the given |query|
// or the queries that |query| is a prefix of.
- scoped_ptr<KnownResults> GetKnownResults(const std::string& query) const;
+ std::unique_ptr<KnownResults> GetKnownResults(const std::string& query) const;
void AddObserver(HistoryDataObserver* observer);
void RemoveObserver(HistoryDataObserver* observer);
@@ -77,7 +77,7 @@ class APP_LIST_EXPORT HistoryData : public base::SupportsWeakPtr<HistoryData> {
private:
// Invoked from |store| with loaded data.
- void OnStoreLoaded(scoped_ptr<Associations> loaded_data);
+ void OnStoreLoaded(std::unique_ptr<Associations> loaded_data);
// Trims the data to keep the most recent |max_primary_| queries.
void TrimEntries();
« no previous file with comments | « ui/app_list/search/history.cc ('k') | ui/app_list/search/history_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698