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

Unified Diff: chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 3 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: chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
index e421d8af0195c304a32dd5f8386de0df25a23c81..7c095e45bd0595242347155bbf82fe527b65f392 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
@@ -175,9 +175,10 @@ const BookmarkNode* PartnerBookmarksShim::GetPartnerBookmarksRoot() const {
return g_partner_model_keeper.Get().partner_bookmarks_root.get();
}
-void PartnerBookmarksShim::SetPartnerBookmarksRoot(BookmarkNode* root_node) {
+void PartnerBookmarksShim::SetPartnerBookmarksRoot(
+ std::unique_ptr<bookmarks::BookmarkNode> root_node) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- g_partner_model_keeper.Get().partner_bookmarks_root.reset(root_node);
+ g_partner_model_keeper.Get().partner_bookmarks_root = std::move(root_node);
g_partner_model_keeper.Get().loaded = true;
FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
PartnerShimLoaded(this));

Powered by Google App Engine
This is Rietveld 408576698