mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
merge: update to ungoogled-chromium 139.0.7258.127
This commit is contained in:
@@ -1 +1 @@
|
||||
139.0.7258.66
|
||||
139.0.7258.127
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
@@ -119,12 +119,11 @@ void TemplateURLTableModel::Reload() {
|
||||
for (TemplateURL* template_url : urls) {
|
||||
// Don't include the expanded set of starter pack keywords if the expansion
|
||||
// feature flag is not enabled.
|
||||
- if ((template_url->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::kGemini &&
|
||||
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) ||
|
||||
- (template_url->starter_pack_id() ==
|
||||
- template_url_starter_pack_data::kPage &&
|
||||
- !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page)) {
|
||||
+
|
||||
+ // Disable all Google AI starter pack options
|
||||
+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
|
||||
+ template_url->starter_pack_id() == template_url_starter_pack_data::kPage) {
|
||||
continue;
|
||||
}
|
||||
|
||||
--- a/components/omnibox/browser/featured_search_provider.cc
|
||||
+++ b/components/omnibox/browser/featured_search_provider.cc
|
||||
@@ -291,13 +291,14 @@ void FeaturedSearchProvider::AddFeatured
|
||||
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
|
||||
// Don't add the expanded set of starter pack engines unless the feature
|
||||
// is enabled.
|
||||
- if ((turl->starter_pack_id() == template_url_starter_pack_data::kGemini &&
|
||||
- !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) ||
|
||||
- (turl->starter_pack_id() == template_url_starter_pack_data::kPage &&
|
||||
- !omnibox_feature_configs::ContextualSearch::Get()
|
||||
- .starter_pack_page)) {
|
||||
+
|
||||
+ // Disable all Google AI starter pack options
|
||||
+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode ||
|
||||
+ turl->starter_pack_id() == template_url_starter_pack_data::kPage) {
|
||||
continue;
|
||||
}
|
||||
+
|
||||
// The history starter pack engine is disabled in incognito mode.
|
||||
if (client_->IsOffTheRecord() &&
|
||||
turl->starter_pack_id() == template_url_starter_pack_data::kHistory) {
|
||||
@@ -106,6 +106,7 @@ extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch
|
||||
extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
|
||||
extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch
|
||||
extra/ungoogled-chromium/add-credits.patch
|
||||
extra/ungoogled-chromium/disable-ai-search-shortcuts.patch
|
||||
|
||||
extra/brave/chrome-importer-files.patch
|
||||
extra/brave/custom-importer.patch
|
||||
|
||||
Reference in New Issue
Block a user