From 5b90bd3a3e706d8c2134804b26f69f0f7d436241 Mon Sep 17 00:00:00 2001 From: Darnell Andries Date: Mon, 16 Sep 2024 21:20:40 -0700 Subject: [PATCH] Address Web Discovery feedback --- browser/extensions/BUILD.gn | 2 ++ browser/extensions/api/settings_private/brave_prefs_util.cc | 2 -- browser/web_discovery/web_discovery_service_factory.cc | 1 + components/constants/BUILD.gn | 6 +++--- components/web_discovery/browser/DEPS | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn index dd7841db2164..90802e48461c 100644 --- a/browser/extensions/BUILD.gn +++ b/browser/extensions/BUILD.gn @@ -108,6 +108,8 @@ source_set("extensions") { "api/rewards_notifications_api.h", "api/settings_private/brave_prefs_util.cc", "api/settings_private/brave_prefs_util.h", + "api/web_discovery_api.cc", + "api/web_discovery_api.h", "brave_extension_management.cc", "brave_extension_management.h", "brave_extension_provider.cc", diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index c5efe7b0460d..3fd9613372e3 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -24,8 +24,6 @@ #include "brave/components/speedreader/common/buildflags/buildflags.h" #include "brave/components/tor/buildflags/buildflags.h" #include "brave/components/web_discovery/buildflags/buildflags.h" -#include "chrome/browser/content_settings/cookie_settings_factory.h" -#include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/api/settings_private/prefs_util.h" #include "chrome/common/extensions/api/settings_private.h" #include "chrome/common/pref_names.h" diff --git a/browser/web_discovery/web_discovery_service_factory.cc b/browser/web_discovery/web_discovery_service_factory.cc index 7da05aa16e7e..3dceb835ee25 100644 --- a/browser/web_discovery/web_discovery_service_factory.cc +++ b/browser/web_discovery/web_discovery_service_factory.cc @@ -34,6 +34,7 @@ WebDiscoveryServiceFactory::WebDiscoveryServiceFactory() WebDiscoveryServiceFactory::~WebDiscoveryServiceFactory() = default; +// static ProfileSelections WebDiscoveryServiceFactory::CreateProfileSelections() { if (!base::FeatureList::IsEnabled(features::kBraveWebDiscoveryNative)) { return ProfileSelections::BuildNoProfilesSelected(); diff --git a/components/constants/BUILD.gn b/components/constants/BUILD.gn index a3aea520e863..aa683cb8af8b 100644 --- a/components/constants/BUILD.gn +++ b/components/constants/BUILD.gn @@ -28,12 +28,12 @@ source_set("constants") { "webui_url_constants.h", ] - public_deps = [ ":brave_services_key" ] - deps = [ - "//base", + public_deps = [ + ":brave_services_key", "//brave/components/web_discovery/buildflags", "//extensions/buildflags", ] + deps = [ "//base" ] } source_set("brave_service_key_helper") { diff --git a/components/web_discovery/browser/DEPS b/components/web_discovery/browser/DEPS index 290a8dab5740..1c0aaedc075e 100644 --- a/components/web_discovery/browser/DEPS +++ b/components/web_discovery/browser/DEPS @@ -2,6 +2,7 @@ include_rules = [ "-content", "+services/network/public", "+extensions/buildflags/buildflags.h", + "+services/network/test", "+services/service_manager/public/cpp", "+third_party/re2", "+third_party/zlib",