Extends components/search_engines/search_engines_pref_names.h for new…

… pref
brave · May 7, 2021 · 131c9aa · 131c9aa
1 parent 7a0d11b
commit 131c9aa
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 30 deletions.
diff --git a/browser/search_engines/private_window_search_engine_provider_service.cc b/browser/search_engines/private_window_search_engine_provider_service.cc
@@ -5,10 +5,10 @@
 
 #include "brave/browser/search_engines/private_window_search_engine_provider_service.h"
 
-#include "brave/components/search_engines/search_engines_pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/default_search_manager.h"
+#include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url.h"
 
 PrivateWindowSearchEngineProviderService::
@@ -17,7 +17,7 @@ PrivateWindowSearchEngineProviderService(Profile* otr_profile)
   DCHECK(otr_profile->IsIncognitoProfile());
 
   const bool use_extension_provider = ShouldUseExtensionSearchProvider();
-  otr_profile->GetPrefs()->SetBoolean(kDefaultSearchProviderByExtension,
+  otr_profile->GetPrefs()->SetBoolean(prefs::kDefaultSearchProviderByExtension,
                                       use_extension_provider);
 
   if (use_extension_provider) {
@@ -55,7 +55,7 @@ ConfigureSearchEngineProvider() {
 
 void PrivateWindowSearchEngineProviderService::OnTemplateURLServiceChanged() {
   const bool use_extension_provider = ShouldUseExtensionSearchProvider();
-  otr_profile_->GetPrefs()->SetBoolean(kDefaultSearchProviderByExtension,
+  otr_profile_->GetPrefs()->SetBoolean(prefs::kDefaultSearchProviderByExtension,
                                        use_extension_provider);
 
   if (use_extension_provider) {

diff --git a/browser/search_engines/search_engine_provider_service_factory.cc b/browser/search_engines/search_engine_provider_service_factory.cc
@@ -12,12 +12,12 @@
 #include "brave/browser/search_engines/tor_window_search_engine_provider_service.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/search_engines/brave_prepopulated_engines.h"
-#include "brave/components/search_engines/search_engines_pref_names.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/search_engines/search_engines_pref_names.h"
 
 namespace {
 
@@ -101,5 +101,6 @@ SearchEngineProviderServiceFactory::ServiceIsCreatedWithBrowserContext() const {
 void SearchEngineProviderServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kUseAlternativeSearchEngineProvider, false);
-  registry->RegisterBooleanPref(kDefaultSearchProviderByExtension, false);
+  registry->RegisterBooleanPref(prefs::kDefaultSearchProviderByExtension,
+                                false);
 }
diff --git a/browser/search_engines/tor_window_search_engine_provider_service.cc b/browser/search_engines/tor_window_search_engine_provider_service.cc
@@ -6,9 +6,9 @@
 #include "brave/browser/search_engines/tor_window_search_engine_provider_service.h"
 
 #include "brave/components/search_engines/brave_prepopulated_engines.h"
-#include "brave/components/search_engines/search_engines_pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_service.h"
+#include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 
@@ -36,7 +36,7 @@ void TorWindowSearchEngineProviderService::Shutdown() {
 
 void TorWindowSearchEngineProviderService::ConfigureSearchEngineProvider() {
   const bool use_extension_provider = ShouldUseExtensionSearchProvider();
-  otr_profile_->GetPrefs()->SetBoolean(kDefaultSearchProviderByExtension,
+  otr_profile_->GetPrefs()->SetBoolean(prefs::kDefaultSearchProviderByExtension,
                                        use_extension_provider);
 
   if (use_extension_provider) {

diff --git a/chromium_src/components/search_engines/default_search_manager.cc b/chromium_src/components/search_engines/default_search_manager.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "brave/components/search_engines/search_engines_pref_names.h"
+#include "components/search_engines/search_engines_pref_names.h"
 
 // When extension is loaded and it provides search provider as a default
 // provider, that search engine data is stored in
@@ -32,8 +32,9 @@
 // extension controlled prefs.
 
 // clang-format off
-#define LOADDEFAULTSEARCHENGINEFROMPREFS_BRAVE                                \
-  } else if (pref_service_->GetBoolean(kDefaultSearchProviderByExtension)) {  \
+#define LOADDEFAULTSEARCHENGINEFROMPREFS_BRAVE                 \
+  } else if (pref_service_->GetBoolean(                        \
+                 prefs::kDefaultSearchProviderByExtension)) {  \
     extension_default_search_ = std::move(turl_data);
 // clang-format on
 

diff --git a/...earch_engines/search_engines_pref_names.h → ...arch_engines/search_engines_pref_names.cc b/...earch_engines/search_engines_pref_names.h → ...arch_engines/search_engines_pref_names.cc
@@ -3,10 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BRAVE_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
-#define BRAVE_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
+#include "../../../../components/search_engines/search_engines_pref_names.cc"
 
-constexpr char kDefaultSearchProviderByExtension[] =
+namespace prefs {
+
+const char kDefaultSearchProviderByExtension[] =
     "brave.default_search_provider_by_extension";
 
-#endif  // BRAVE_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
+}  // namespace prefs
diff --git a/chromium_src/components/search_engines/search_engines_pref_names.h b/chromium_src/components/search_engines/search_engines_pref_names.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
+
+#include "../../../../components/search_engines/search_engines_pref_names.h"
+
+namespace prefs {
+
+extern const char kDefaultSearchProviderByExtension[];
+
+}  // namespace prefs
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINES_PREF_NAMES_H_
diff --git a/components/search_engines/sources.gni b/components/search_engines/sources.gni
@@ -3,10 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brave_components_search_engines_prepopulated_engines_sources = [
+brave_components_search_engines_sources = [
   "//brave/components/search_engines/brave_prepopulated_engines.cc",
-  "//brave/components/search_engines/brave_prepopulated_engines.h",
+  "//brave/components/search_engines/brave_prepopulated_engines.h"
 ]
-
-brave_components_search_engines_sources =
-    [ "//brave/components/search_engines/search_engines_pref_names.h" ]
diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch
@@ -1,20 +1,12 @@
 diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
-index c2b09f071782eb1a9a3a7cbadc25b66a651cb89e..bf0d956f2368004a1c79f4e04e4df6531bf298c3 100644
+index c2b09f071782eb1a9a3a7cbadc25b66a651cb89e..261310df1f7e24421230e897a22e767a4740cc98 100644
 --- a/components/search_engines/BUILD.gn
 +++ b/components/search_engines/BUILD.gn
-@@ -101,6 +101,7 @@ static_library("search_engines") {
-       "//url:gurl_android",
-     ]
-   }
-+  sources += brave_components_search_engines_sources
- }
-
- source_set("search_engine_utils") {
-@@ -197,6 +198,7 @@ json_to_struct("prepopulated_engines") {
+@@ -197,6 +197,7 @@ json_to_struct("prepopulated_engines") {
    schema_file = "prepopulated_engines_schema.json"
    namespace = "TemplateURLPrepopulateData"
    deps = [ ":search_engine_type" ]
-+  additional_sources = brave_components_search_engines_prepopulated_engines_sources
++  additional_sources = brave_components_search_engines_sources
  }
 
  if (is_android) {