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

Unified Diff: chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc

Issue 2928823003: Make it possible to build without enable_supervised_users.
Patch Set: Does it still compile with the feature enabled? Created 3 years, 6 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/ntp_tiles/chrome_most_visited_sites_factory.cc
diff --git a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc
index bdc276f4b7c4dc3ad36599dd06c81b435376af8c..3d8bb0c97f2877ac7d4fad3d8844c3c46bf21f09 100644
--- a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc
+++ b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc
@@ -17,21 +17,26 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search/suggestions/image_decoder_impl.h"
#include "chrome/browser/search/suggestions/suggestions_service_factory.h"
-#include "chrome/browser/supervised_user/supervised_user_service.h"
-#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
-#include "chrome/browser/supervised_user/supervised_user_service_observer.h"
-#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
#include "chrome/browser/thumbnails/thumbnail_list_source.h"
+#include "chrome/common/features.h"
#include "components/history/core/browser/top_sites.h"
#include "components/image_fetcher/core/image_fetcher_impl.h"
#include "components/ntp_tiles/icon_cacher_impl.h"
#include "components/ntp_tiles/metrics.h"
#include "components/ntp_tiles/most_visited_sites.h"
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_service_observer.h"
+#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
+#endif
+
using suggestions::SuggestionsServiceFactory;
namespace {
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
class SupervisorBridge : public ntp_tiles::MostVisitedSitesSupervisor,
public SupervisedUserServiceObserver {
public:
@@ -103,6 +108,7 @@ void SupervisorBridge::OnURLFilterChanged() {
supervisor_observer_->OnBlockedSitesChanged();
}
}
+#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
} // namespace
@@ -129,5 +135,10 @@ ChromeMostVisitedSitesFactory::NewForProfile(Profile* profile) {
base::MakeUnique<image_fetcher::ImageFetcherImpl>(
base::MakeUnique<suggestions::ImageDecoderImpl>(),
profile->GetRequestContext())),
- base::MakeUnique<SupervisorBridge>(profile));
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ base::MakeUnique<SupervisorBridge>(profile)
+#else
+ nullptr
+#endif
+ );
}

Powered by Google App Engine
This is Rietveld 408576698