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

Unified Diff: ios/chrome/browser/history/history_client_impl.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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
Index: ios/chrome/browser/history/history_client_impl.h
diff --git a/ios/chrome/browser/history/history_client_impl.h b/ios/chrome/browser/history/history_client_impl.h
index abcfff3f6b7c32df20575f0742cf4b3c41370397..bae4809dd2687cdd164cc747b1a5b2e8bab08918 100644
--- a/ios/chrome/browser/history/history_client_impl.h
+++ b/ios/chrome/browser/history/history_client_impl.h
@@ -5,12 +5,12 @@
#ifndef IOS_CHROME_BROWSER_HISTORY_HISTORY_CLIENT_IMPL_H_
#define IOS_CHROME_BROWSER_HISTORY_HISTORY_CLIENT_IMPL_H_
+#include <memory>
#include <set>
#include "base/callback_forward.h"
#include "base/callback_list.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "components/history/core/browser/history_client.h"
@@ -34,7 +34,7 @@ class HistoryClientImpl : public history::HistoryClient,
void Shutdown() override;
bool CanAddURL(const GURL& url) override;
void NotifyProfileError(sql::InitStatus init_status) override;
- scoped_ptr<history::HistoryBackendClient> CreateBackendClient() override;
+ std::unique_ptr<history::HistoryBackendClient> CreateBackendClient() override;
// bookmarks::BaseBookmarkModelObserver implementation.
void BookmarkModelChanged() override;
@@ -57,8 +57,8 @@ class HistoryClientImpl : public history::HistoryClient,
base::Callback<void(const std::set<GURL>&)> on_bookmarks_removed_;
// Subscription for notifications of changes to favicons.
- scoped_ptr<base::CallbackList<void(const std::set<GURL>&,
- const GURL&)>::Subscription>
+ std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
+ const GURL&)>::Subscription>
favicons_changed_subscription_;
DISALLOW_COPY_AND_ASSIGN(HistoryClientImpl);
« no previous file with comments | « ios/chrome/browser/google/google_url_tracker_factory.cc ('k') | ios/chrome/browser/history/history_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698