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

Unified Diff: chrome/browser/bookmarks/bookmark_model_factory.cc

Issue 2185973003: [Offline Pages] Delete associated page along with bookmark. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename Owned* to OfflinePageBookmarkObserver and Impl classes. Created 4 years, 4 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/bookmarks/bookmark_model_factory.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 079bf75634ea5624a808522027f5303a8ee5bf0e..55e8ba1c1ec7bd012bceb621ebfd14bd292f7248 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -26,6 +26,10 @@
#include "components/undo/bookmark_undo_service.h"
#include "content/public/browser/browser_thread.h"
+#if BUILDFLAG(ANDROID_JAVA_UI)
+#include "chrome/browser/android/offline_pages/offline_page_bookmark_observer_impl.h"
+#endif
+
using bookmarks::BookmarkModel;
// static
@@ -62,9 +66,16 @@ BookmarkModelFactory::~BookmarkModelFactory() {
KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
- BookmarkModel* bookmark_model =
- new BookmarkModel(base::WrapUnique(new ChromeBookmarkClient(
- profile, ManagedBookmarkServiceFactory::GetForProfile(profile))));
+ std::unique_ptr<bookmarks::OfflinePageBookmarkObserver>
+ offline_page_observer = nullptr;
+#if BUILDFLAG(ANDROID_JAVA_UI)
+ offline_page_observer =
+ base::MakeUnique<offline_pages::OfflinePageBookmarkObserverImpl>(profile);
+#endif // BUILDFLAG(ANDROID_JAVA_UI)
+ BookmarkModel* bookmark_model = new BookmarkModel(
+ base::WrapUnique(new ChromeBookmarkClient(
+ profile, ManagedBookmarkServiceFactory::GetForProfile(profile))),
+ std::move(offline_page_observer));
bookmark_model->Load(profile->GetPrefs(), profile->GetPath(),
StartupTaskRunnerServiceFactory::GetForProfile(profile)
->GetBookmarkTaskRunner(),

Powered by Google App Engine
This is Rietveld 408576698