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

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

Issue 1904613005: [Offline pages] Removing bookmarks dependency from offline pages component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests compilation 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: 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 4d9846a484f3199e2e3734fe83bcc03d1c0a1e62..77e6aac68ba9a56a88c60c97708fe83306c49bfe 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -26,13 +26,6 @@
#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_model_factory.h"
-#include "components/offline_pages/offline_page_bookmark_bridge.h"
-#include "components/offline_pages/offline_page_feature.h"
-#include "components/offline_pages/offline_page_model.h"
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
-
using bookmarks::BookmarkModel;
// static
@@ -59,10 +52,6 @@ BookmarkModelFactory::BookmarkModelFactory()
DependsOn(BookmarkUndoServiceFactory::GetInstance());
DependsOn(ManagedBookmarkServiceFactory::GetInstance());
DependsOn(StartupTaskRunnerServiceFactory::GetInstance());
-#if BUILDFLAG(ANDROID_JAVA_UI)
- if (offline_pages::IsOfflinePagesEnabled())
- DependsOn(offline_pages::OfflinePageModelFactory::GetInstance());
-#endif
}
BookmarkModelFactory::~BookmarkModelFactory() {
@@ -89,15 +78,6 @@ KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
if (register_bookmark_undo_service_as_observer)
BookmarkUndoServiceFactory::GetForProfile(profile)->Start(bookmark_model);
-#if BUILDFLAG(ANDROID_JAVA_UI)
- if (offline_pages::IsOfflinePagesEnabled()) {
- // This observer will delete itself when BookmarkModelDeleted is called.
- bookmark_model->AddObserver(new offline_pages::OfflinePageBookmarkBridge(
- offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile),
- bookmark_model));
- }
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
-
return bookmark_model;
}
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_utils_unittest.cc ('k') | chrome/browser/net/net_error_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698