summaryrefslogtreecommitdiff
path: root/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
diff options
context:
space:
mode:
authorShokara Kou <kou@13f0.net>2022-06-08 08:41:15 -0400
committerShokara Kou <kou@13f0.net>2022-06-08 08:41:15 -0400
commit2be1931967e4073a55d7ac3e3ecdff7c825a63f4 (patch)
treefbccd4a9f89d535835c1cb711c3c36d03baee871 /www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
parent312b6669fd956f3e97dd005c1441152fb4e568ec (diff)
update ugc to 102.0.5005.61-3
Diffstat (limited to 'www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch')
-rw-r--r--www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch42
1 files changed, 21 insertions, 21 deletions
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
index b80101e..e99820b 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
@@ -1,8 +1,8 @@
1# Add flag to disable automatic search engine collection 1# Add flag to disable automatic search engine collection
2 2
3--- chrome/browser/ungoogled_flag_entries.h.orig 3--- a/chrome/browser/ungoogled_flag_entries.h
4+++ chrome/browser/ungoogled_flag_entries.h 4+++ b/chrome/browser/ungoogled_flag_entries.h
5@@ -16,4 +16,8 @@ 5@@ -12,4 +12,8 @@
6 "Handling of extension MIME type requests", 6 "Handling of extension MIME type requests",
7 "Used when deciding how to handle a request for a CRX or User Script MIME type. ungoogled-chromium flag.", 7 "Used when deciding how to handle a request for a CRX or User Script MIME type. ungoogled-chromium flag.",
8 kOsAll, MULTI_VALUE_TYPE(kExtensionHandlingChoices)}, 8 kOsAll, MULTI_VALUE_TYPE(kExtensionHandlingChoices)},
@@ -11,9 +11,9 @@
11+ "Prevents search engines from being added automatically. ungoogled-chromium flag.", 11+ "Prevents search engines from being added automatically. ungoogled-chromium flag.",
12+ kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")}, 12+ kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
13 #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ 13 #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
14--- chrome/renderer/chrome_render_frame_observer.cc.orig 14--- a/chrome/renderer/chrome_render_frame_observer.cc
15+++ chrome/renderer/chrome_render_frame_observer.cc 15+++ b/chrome/renderer/chrome_render_frame_observer.cc
16@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF 16@@ -187,9 +187,10 @@ ChromeRenderFrameObserver::ChromeRenderF
17 if (!render_frame->IsMainFrame()) 17 if (!render_frame->IsMainFrame())
18 return; 18 return;
19 19
@@ -25,7 +25,7 @@
25 if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) 25 if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
26 SetClientSidePhishingDetection(); 26 SetClientSidePhishingDetection();
27 #endif 27 #endif
28@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis 28@@ -248,14 +249,16 @@ void ChromeRenderFrameObserver::DidFinis
29 if (frame->Parent()) 29 if (frame->Parent())
30 return; 30 return;
31 31
@@ -50,9 +50,9 @@
50 } 50 }
51 } 51 }
52 52
53--- chrome/renderer/chrome_render_frame_observer.h.orig 53--- a/chrome/renderer/chrome_render_frame_observer.h
54+++ chrome/renderer/chrome_render_frame_observer.h 54+++ b/chrome/renderer/chrome_render_frame_observer.h
55@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public 55@@ -140,6 +140,7 @@ class ChromeRenderFrameObserver : public
56 #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) 56 #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
57 safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr; 57 safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr;
58 #endif 58 #endif
@@ -60,8 +60,8 @@
60 60
61 // Owned by ChromeContentRendererClient and outlive us. 61 // Owned by ChromeContentRendererClient and outlive us.
62 web_cache::WebCacheImpl* web_cache_impl_; 62 web_cache::WebCacheImpl* web_cache_impl_;
63--- components/search_engines/template_url_service.cc.orig 63--- a/components/search_engines/template_url_service.cc
64+++ components/search_engines/template_url_service.cc 64+++ b/components/search_engines/template_url_service.cc
65@@ -12,6 +12,7 @@ 65@@ -12,6 +12,7 @@
66 #include "base/bind.h" 66 #include "base/bind.h"
67 #include "base/callback.h" 67 #include "base/callback.h"
@@ -70,7 +70,7 @@
70 #include "base/containers/contains.h" 70 #include "base/containers/contains.h"
71 #include "base/debug/crash_logging.h" 71 #include "base/debug/crash_logging.h"
72 #include "base/format_macros.h" 72 #include "base/format_macros.h"
73@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template 73@@ -200,6 +201,12 @@ bool IsCreatedByExtension(const Template
74 template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION; 74 template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
75 } 75 }
76 76
@@ -83,7 +83,7 @@
83 } // namespace 83 } // namespace
84 84
85 // TemplateURLService::LessWithPrefix ----------------------------------------- 85 // TemplateURLService::LessWithPrefix -----------------------------------------
86@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService( 86@@ -285,6 +292,7 @@ TemplateURLService::TemplateURLService(
87 std::unique_ptr<TemplateURLServiceClient> client, 87 std::unique_ptr<TemplateURLServiceClient> client,
88 const base::RepeatingClosure& dsp_change_callback) 88 const base::RepeatingClosure& dsp_change_callback)
89 : prefs_(prefs), 89 : prefs_(prefs),
@@ -91,7 +91,7 @@
91 search_terms_data_(std::move(search_terms_data)), 91 search_terms_data_(std::move(search_terms_data)),
92 web_data_service_(web_data_service), 92 web_data_service_(web_data_service),
93 client_(std::move(client)), 93 client_(std::move(client)),
94@@ -363,8 +371,8 @@ bool TemplateURLService::CanAddAutogener 94@@ -366,8 +374,8 @@ bool TemplateURLService::CanAddAutogener
95 // that may interfere with search queries). An easy heuristic for this is 95 // that may interfere with search queries). An easy heuristic for this is
96 // whether the user has a TemplateURL that has been manually modified (e.g., 96 // whether the user has a TemplateURL that has been manually modified (e.g.,
97 // renamed) connected to the same host. 97 // renamed) connected to the same host.
@@ -102,7 +102,7 @@
102 } 102 }
103 103
104 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( 104 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
105@@ -1496,6 +1504,8 @@ SyncDataMap TemplateURLService::CreateGU 105@@ -1516,6 +1524,8 @@ SyncDataMap TemplateURLService::CreateGU
106 106
107 void TemplateURLService::Init(const Initializer* initializers, 107 void TemplateURLService::Init(const Initializer* initializers,
108 int num_initializers) { 108 int num_initializers) {
@@ -111,7 +111,7 @@
111 if (client_) 111 if (client_)
112 client_->SetOwner(this); 112 client_->SetOwner(this);
113 113
114@@ -1632,6 +1642,9 @@ void TemplateURLService::ChangeToLoadedS 114@@ -1654,6 +1664,9 @@ void TemplateURLService::ChangeToLoadedS
115 115
116 bool TemplateURLService::CanAddAutogeneratedKeywordForHost( 116 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
117 const std::string& host) const { 117 const std::string& host) const {
@@ -121,11 +121,11 @@
121 const TemplateURLSet* urls = provider_map_->GetURLsForHost(host); 121 const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
122 if (!urls) 122 if (!urls)
123 return true; 123 return true;
124--- components/search_engines/template_url_service.h.orig 124--- a/components/search_engines/template_url_service.h
125+++ components/search_engines/template_url_service.h 125+++ b/components/search_engines/template_url_service.h
126@@ -706,6 +706,8 @@ class TemplateURLService : public WebDat 126@@ -716,6 +716,8 @@ class TemplateURLService : public WebDat
127 // ---------- Browser state related members --------------------------------- 127 // ---------- Browser state related members ---------------------------------
128 PrefService* prefs_ = nullptr; 128 raw_ptr<PrefService> prefs_ = nullptr;
129 129
130+ bool should_autocollect_; // Whether search engines should be auto-collected 130+ bool should_autocollect_; // Whether search engines should be auto-collected
131+ 131+