Thorium_Archive/thorium-mirror
1
0
Fork 0
mirror of https://github.com/Alex313031/thorium.git synced 2025-01-09 19:37:30 -03:00
Code Issues Projects Releases Packages Wiki Activity

M124 stage 1

Browse source
This commit is contained in:
Alexander Frick 2024-05-12 06:56:52 -05:00
parent 013db737ce
commit a258b704c2
15 changed files with 1596 additions and 2183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
infra/PATCHES.md
View file

@ -59,6 +59,9 @@ Disable Captive Portals Detection > https://github.com/uazo/cromite/blob/master/
Enable Do Not Track By Default Patch > https://github.com/GrapheneOS/Vanadium/blob/main/patches/0045-enable-dubious-Do-Not-Track-feature-by-default.patch
Enable Fingerprinting Protection Patch
- Made by me.
Show full URLs by Default Patch > https://github.com/Alex313031/thorium/blob/74219f27911e133483c3ab85c70ba4360ea98423/src/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc#L292
Disable Privacy Sandbox (previously known as FLOC) Patch > https://github.com/ungoogled-software/ungoogled-chromium/blob/master/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch

2
infra/THORIUM_DEV_BOOKMARKS.html
View file

@ -39,7 +39,7 @@
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.218:components/privacy_sandbox/privacy_sandbox_settings.cc;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">privacy_sandbox_settings.cc - Chromium Code Search</A>
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.218:components/privacy_sandbox/tracking_protection_prefs.cc;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">tracking_protection_prefs.cc - Chromium Code Search</A>
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.218:components/search_engines/prepopulated_engines.json;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">prepopulated_engines.json - Chromium Code Search</A>
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.218:components/search_engines/template_url_prepopulate_data.cc;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">template_url_prepopulate_data.cc - Chromium Code Search</A>
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.218:components/search_engines/search_engine_countries-inc.cc;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">search_engine_countries-inc.cc - Chromium Code Search</A>
</DL><p>
<DT><H3 ADD_DATE="1706580105" LAST_MODIFIED="0">THOR2</H3>
<DL><p>

4
src/chrome/browser/background/background_mode_manager.cc
View file

@ -554,7 +554,9 @@ void BackgroundModeManager::OnProfileWillBeRemoved(
const base::FilePath& profile_path) {
Profile* profile =
g_browser_process->profile_manager()->GetProfileByPath(profile_path);
DCHECK(profile);
if (!profile) {
return;
}
UnregisterProfile(profile);
}

18
src/chrome/browser/net/stub_resolver_config_reader.cc
View file

@ -165,13 +165,13 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state,
pref_change_registrar_.Add(prefs::kBuiltInDnsClientEnabled, pref_callback);
pref_change_registrar_.Add(prefs::kDnsOverHttpsMode, pref_callback);
pref_change_registrar_.Add(prefs::kDnsOverHttpsTemplates, pref_callback);
pref_change_registrar_.Add(prefs::kAdditionalDnsQueryTypesEnabled,
pref_callback);
#if BUILDFLAG(IS_CHROMEOS_ASH)
pref_change_registrar_.Add(prefs::kDnsOverHttpsTemplatesWithIdentifiers,
#if BUILDFLAG(IS_CHROMEOS)
pref_change_registrar_.Add(prefs::kDnsOverHttpsEffectiveTemplatesChromeOS,
pref_callback);
pref_change_registrar_.Add(prefs::kDnsOverHttpsSalt, pref_callback);
#else
pref_change_registrar_.Add(prefs::kDnsOverHttpsTemplates, pref_callback);
#endif
parental_controls_delay_timer_.Start(
@ -204,6 +204,8 @@ void StubResolverConfigReader::RegisterPrefs(PrefRegistrySimple* registry) {
#if BUILDFLAG(IS_CHROMEOS)
registry->RegisterStringPref(prefs::kDnsOverHttpsTemplatesWithIdentifiers,
std::string());
registry->RegisterStringPref(prefs::kDnsOverHttpsEffectiveTemplatesChromeOS,
std::string());
registry->RegisterStringPref(prefs::kDnsOverHttpsSalt, std::string());
#endif
}
@ -365,11 +367,9 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
net::DnsOverHttpsConfig doh_config;
if (secure_dns_mode != net::SecureDnsMode::kOff) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
ash::dns_over_https::TemplatesUriResolverImpl doh_template_uri_resolver;
doh_template_uri_resolver.UpdateFromPrefs(local_state_);
doh_config = net::DnsOverHttpsConfig::FromStringLax(
doh_template_uri_resolver.GetEffectiveTemplates());
#if BUILDFLAG(IS_CHROMEOS)
doh_config = net::DnsOverHttpsConfig::FromStringLax(local_state_->GetString(
prefs::kDnsOverHttpsEffectiveTemplatesChromeOS));
#else
doh_config = net::DnsOverHttpsConfig::FromStringLax(
local_state_->GetString(prefs::kDnsOverHttpsTemplates));

14
src/chrome/browser/ui/browser_ui_prefs.cc
View file

@ -66,6 +66,11 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry) {
true);
#endif
registry->RegisterIntegerPref(prefs::kToolbarAvatarLabelSettings, 0);
registry->RegisterTimePref(prefs::kDefaultBrowserLastDeclinedTime,
base::Time());
registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
}
void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@ -75,12 +80,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
GetHomeButtonAndHomePageIsNewTabPageFlags());
registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
bool reset_check_default = false;
#if BUILDFLAG(IS_WIN)
reset_check_default = true;
#endif
registry->RegisterBooleanPref(prefs::kResetCheckDefaultBrowser,
reset_check_default);
registry->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
@ -169,4 +168,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
}

40
src/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
View file

@ -11,10 +11,13 @@
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "base/task/single_thread_task_runner.h"
#include "base/types/pass_key.h"
#include "chrome/browser/infobars/confirm_infobar_creator.h"
#include "chrome/browser/ui/startup/default_browser_prompt.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/grit/branded_strings.h"
#include "chrome/grit/generated_resources.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "components/infobars/core/infobar.h"
#include "components/vector_icons/vector_icons.h"
#include "ui/base/l10n/l10n_util.h"
@ -22,20 +25,25 @@
namespace chrome {
// static
void DefaultBrowserInfoBarDelegate::Create(
infobars::InfoBar* DefaultBrowserInfoBarDelegate::Create(
infobars::ContentInfoBarManager* infobar_manager,
Profile* profile) {
return;
}
DefaultBrowserInfoBarDelegate::DefaultBrowserInfoBarDelegate(Profile* profile)
DefaultBrowserInfoBarDelegate::DefaultBrowserInfoBarDelegate(
base::PassKey<DefaultBrowserInfoBarDelegate>,
Profile* profile)
: profile_(profile) {
// We want the info-bar to stick-around for few seconds and then be hidden
// on the next navigation after that.
base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&DefaultBrowserInfoBarDelegate::AllowExpiry,
weak_factory_.GetWeakPtr()),
base::Seconds(8));
if (!base::FeatureList::IsEnabled(features::kDefaultBrowserPromptRefresh)) {
// We want the info-bar to stick-around for few seconds and then be hidden
// on the next navigation after that.
base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&DefaultBrowserInfoBarDelegate::AllowExpiry,
weak_factory_.GetWeakPtr()),
base::Seconds(8));
}
}
DefaultBrowserInfoBarDelegate::~DefaultBrowserInfoBarDelegate() {
@ -74,9 +82,15 @@ void DefaultBrowserInfoBarDelegate::InfoBarDismissed() {
UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
DISMISS_INFO_BAR,
NUM_INFO_BAR_USER_INTERACTION_TYPES);
ConfirmInfoBarDelegate::InfoBarDismissed();
}
std::u16string DefaultBrowserInfoBarDelegate::GetMessageText() const {
if (base::FeatureList::IsEnabled(features::kDefaultBrowserPromptRefresh) &&
features::kUpdatedInfoBarCopy.Get()) {
return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_REFRESH_TEXT);
}
return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_TEXT);
}
@ -87,6 +101,11 @@ int DefaultBrowserInfoBarDelegate::GetButtons() const {
std::u16string DefaultBrowserInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
DCHECK_EQ(BUTTON_OK, button);
if (base::FeatureList::IsEnabled(features::kDefaultBrowserPromptRefresh) &&
features::kUpdatedInfoBarCopy.Get()) {
return l10n_util::GetStringUTF16(
IDS_DEFAULT_BROWSER_INFOBAR_REFRESH_OK_BUTTON_LABEL);
}
return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL);
}
@ -102,7 +121,8 @@ bool DefaultBrowserInfoBarDelegate::Accept() {
// and it will be automatically freed once all its tasks have finished.
base::MakeRefCounted<shell_integration::DefaultBrowserWorker>()
->StartSetAsDefault(base::NullCallback());
return true;
return ConfirmInfoBarDelegate::Accept();
}
} // namespace chrome

18
src/chrome/browser/ui/startup/infobar_utils.cc
View file

@ -80,8 +80,9 @@ void AddInfoBarsIfNecessary(Browser* browser,
const base::CommandLine& startup_command_line,
chrome::startup::IsFirstRun is_first_run,
bool is_web_app) {
if (!browser || !profile || browser->tab_strip_model()->count() == 0)
if (!browser || !profile || browser->tab_strip_model()->count() == 0) {
return;
}
// Show the Automation info bar unless it has been disabled by policy.
bool show_bad_flags_security_warnings = ShouldShowBadFlagsSecurityWarnings();
@ -97,8 +98,9 @@ void AddInfoBarsIfNecessary(Browser* browser,
}
#endif
if (IsAutomationEnabled())
if (IsAutomationEnabled()) {
AutomationInfoBarDelegate::Create();
}
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kProtectedAudiencesConsentedDebugToken)) {
@ -113,8 +115,9 @@ void AddInfoBarsIfNecessary(Browser* browser,
// Do not show any other info bars in Kiosk mode, because it's unlikely that
// the viewer can act upon or dismiss them.
if (IsKioskModeEnabled())
if (IsKioskModeEnabled()) {
return;
}
// Web apps should not display the session restore bubble (crbug.com/1264121)
if (!is_web_app && HasPendingUncleanExit(browser->profile()))
@ -136,12 +139,14 @@ void AddInfoBarsIfNecessary(Browser* browser,
// picker, which means that `chrome::startup::IsProcessStartup` will already
// be `kNo` when the first browser window is opened.
static bool infobars_shown = false;
if (infobars_shown)
if (infobars_shown) {
return;
}
infobars_shown = true;
if (show_bad_flags_security_warnings)
if (show_bad_flags_security_warnings) {
chrome::ShowBadFlagsPrompt(web_contents);
}
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);
@ -150,8 +155,9 @@ void AddInfoBarsIfNecessary(Browser* browser,
if (!is_web_app &&
!startup_command_line.HasSwitch(switches::kNoDefaultBrowserCheck)) {
// The default browser prompt should only be shown after the first run.
if (is_first_run == chrome::startup::IsFirstRun::kNo)
if (is_first_run == chrome::startup::IsFirstRun::kNo) {
ShowDefaultBrowserPrompt(profile);
}
}
#endif
}

2
src/chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml
View file

@ -17,7 +17,7 @@
new generation of web applications.
</p>
<p>
Thorium supports Vorbis, Theora, WebM, AAC, H.264, MP3, and HTML5 audio and video standards.
Thorium supports Vorbis, Theora, WebM, AAC, H.264, H.265, MP3, and HTML5 audio and video standards.
</p>
</description>
<url type="homepage">https://github.com/Alex313031/thorium</url>

2
src/chrome/installer/linux/rpm/build.sh
View file

@ -216,7 +216,7 @@ fi
eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
"${OUTPUTDIR}/installer/theme/BRANDING")
export USR_BIN_SYMLINK_NAME="${PACKAGE}"
export USR_BIN_SYMLINK_NAME="thorium-browser"
stage_install_rpm
do_package

2
src/chrome/installer/linux/rpm/thorium.spec.template
View file

@ -178,7 +178,7 @@ case $CHANNEL in
;;
esac
ln -sf /opt/chromium.org/thorium/thorium-browser /usr/bin/thorium-browser
ln -sf /opt/chromium.org/thorium/thorium-browser /usr/bin/@@USR_BIN_SYMLINK_NAME@@
exit 0

71
src/components/privacy_sandbox/privacy_sandbox_prefs.cc
View file

@ -1,71 +0,0 @@
// Copyright 2024 The Chromium Authors and Alex313031
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/privacy_sandbox/tracking_protection_prefs.h"
namespace privacy_sandbox {
void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
prefs::kPrivacySandboxApisEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1EEANoticeAcknowledged,
false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1RowNoticeAcknowledged,
false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxM1RestrictedNoticeAcknowledged, false);
registry->RegisterIntegerPref(prefs::kPrivacySandboxM1PromptSuppressed, 0);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1TopicsEnabled, false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1FledgeEnabled, false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1AdMeasurementEnabled,
false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1Restricted, false);
registry->RegisterTimePref(prefs::kPrivacySandboxTopicsDataAccessibleSince,
base::Time());
registry->RegisterListPref(prefs::kPrivacySandboxBlockedTopics);
registry->RegisterDictionaryPref(prefs::kPrivacySandboxFledgeJoinBlocked);
registry->RegisterBooleanPref(prefs::kPrivacySandboxNoticeDisplayed, false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxConsentDecisionMade,
false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxNoConfirmationSandboxDisabled, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxNoConfirmationSandboxRestricted, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxNoConfirmationSandboxManaged, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxNoConfirmationThirdPartyCookiesBlocked, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxNoConfirmationManuallyControlled, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxDisabledInsufficientConfirmation, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxFirstPartySetsDataAccessAllowedInitialized, false);
registry->RegisterBooleanPref(
prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPrivacySandboxTopicsConsentGiven,
false);
registry->RegisterTimePref(prefs::kPrivacySandboxTopicsConsentLastUpdateTime,
base::Time());
registry->RegisterIntegerPref(
prefs::kPrivacySandboxTopicsConsentLastUpdateReason,
static_cast<int>(TopicsConsentUpdateSource::kDefaultValue));
registry->RegisterStringPref(
prefs::kPrivacySandboxTopicsConsentTextAtLastUpdate, "");
// Register prefs for tracking protection.
tracking_protection::RegisterProfilePrefs(registry);
}
} // namespace privacy_sandbox

3
src/components/privacy_sandbox/tracking_protection_prefs.cc
View file

@ -74,6 +74,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
prefs::kIpProtectionEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kFingerprintingProtectionEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

94
src/components/search_engines/prepopulated_engines.json
View file

@ -29,7 +29,7 @@
// existing data should get a new version. Otherwise, existing data may
// continue to be used and updates made here will not always appear.
// Also then run tools/search_engine_choice/generate_search_engine_icons.py.
"kCurrentDataVersion": 149
"kCurrentDataVersion": 160
},
// The following engines are included in country lists and are added to the
@ -74,7 +74,7 @@
},
"brave": {
"name": "Brave Search",
"name": "Brave",
"keyword": "search.brave.com",
"favicon_url": "https://cdn.search.brave.com/serp/favicon.ico",
"search_url": "https://search.brave.com/search?q={searchTerms}",
@ -158,6 +158,7 @@
"favicon_url": "https://karmasearch.org/favicon.ico",
"search_url": "https://karmasearch.org/search?q={searchTerms}",
"suggest_url": "https://api.karmasearch.org/search/autosuggest?q={searchTerms}",
"new_tab_url": "https://karmasearch.org/newtab",
"type": "SEARCH_ENGINE_KARMA",
"id": 110
},
@ -168,6 +169,8 @@
"favicon_url": "https://www.lilo.org/wp-content/themes/jarvis_wp/ajans/assets/favicon.ico",
"search_url": "https://search.lilo.org/?q={searchTerms}",
"suggest_url": "https://search.lilo.org/api/?service=suggestions&action=suggest&q={searchTerms}&f=chr&l={language}",
"new_tab_url": "https://search.lilo.org",
"type": "SEARCH_ENGINE_LILO",
"id": 111
},
@ -264,21 +267,24 @@
},
"seznam_cz": {
"name": "Seznam",
"name": "Seznam.cz",
"keyword": "seznam.cz",
"favicon_url": "https://search.seznam.cz/favicon.ico",
"search_url": "https://search.seznam.cz/?q={searchTerms}",
"suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}",
"new_tab_url": "https://search.seznam.cz/?sourceid=chromechoice",
"type": "SEARCH_ENGINE_SEZNAM",
"id": 25
},
// TODO(b/335397380): Remove this entry once b/322513019 is fixed.
"seznam_sk": {
"name": "Seznam",
"name": "Seznam.cz",
"keyword": "seznam.sk",
"favicon_url": "https://search.seznam.sk/favicon.ico",
"search_url": "https://search.seznam.sk/?q={searchTerms}",
"suggest_url": "https://suggest.seznam.sk/fulltext_ff?phrase={searchTerms}",
"favicon_url": "https://search.seznam.cz/favicon.ico",
"search_url": "https://search.seznam.cz/?q={searchTerms}",
"suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}",
"new_tab_url": "https://search.seznam.cz/?sourceid=chromechoice",
"type": "SEARCH_ENGINE_SEZNAM",
"id": 25
},
@ -311,7 +317,7 @@
},
"yahoo": {
"name": "Yahoo Search",
"name": "Yahoo!",
"keyword": "yahoo.com",
"favicon_url": "https://search.yahoo.com/favicon.ico",
"search_url": "https://search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas_sfp&p={searchTerms}",
@ -322,7 +328,7 @@
},
"yahoo_ar": {
"name": "Yahoo Search",
"name": "Yahoo! Argentina",
"keyword": "ar.yahoo.com",
"favicon_url": "https://ar.search.yahoo.com/favicon.ico",
"search_url": "https://ar.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -332,7 +338,7 @@
},
"yahoo_at": {
"name": "Yahoo Search",
"name": "Yahoo! \u00d6sterreich",
"keyword": "at.yahoo.com",
"favicon_url": "https://at.search.yahoo.com/favicon.ico",
"search_url": "https://at.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -342,7 +348,7 @@
},
"yahoo_au": {
"name": "Yahoo Search",
"name": "Yahoo!7",
"keyword": "au.yahoo.com",
"favicon_url": "https://au.search.yahoo.com/favicon.ico",
"search_url": "https://au.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -352,7 +358,7 @@
},
"yahoo_br": {
"name": "Yahoo Search",
"name": "Yahoo! Brasil",
"keyword": "br.yahoo.com",
"favicon_url": "https://br.search.yahoo.com/favicon.ico",
"search_url": "https://br.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -362,7 +368,7 @@
},
"yahoo_ca": {
"name": "Yahoo Search",
"name": "Yahoo! Canada",
"keyword": "ca.yahoo.com",
"favicon_url": "https://ca.search.yahoo.com/favicon.ico",
"search_url": "https://ca.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -372,7 +378,7 @@
},
"yahoo_ch": {
"name": "Yahoo Search",
"name": "Yahoo! Schweiz",
"keyword": "ch.yahoo.com",
"favicon_url": "https://ch.search.yahoo.com/favicon.ico",
"search_url": "https://ch.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -382,7 +388,7 @@
},
"yahoo_cl": {
"name": "Yahoo Search",
"name": "Yahoo! Chile",
"keyword": "cl.yahoo.com",
"favicon_url": "https://cl.search.yahoo.com/favicon.ico",
"search_url": "https://cl.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -392,7 +398,7 @@
},
"yahoo_co": {
"name": "Yahoo Search",
"name": "Yahoo! Colombia",
"keyword": "co.yahoo.com",
"favicon_url": "https://co.search.yahoo.com/favicon.ico",
"search_url": "https://co.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -402,7 +408,7 @@
},
"yahoo_de": {
"name": "Yahoo Search",
"name": "Yahoo! Deutschland",
"keyword": "de.yahoo.com",
"favicon_url": "https://de.search.yahoo.com/favicon.ico",
"search_url": "https://de.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -415,7 +421,7 @@
// suggestion is disabled. For some of them, we might consider using one of
// the other language/country URLs as a fallback.
"yahoo_dk": {
"name": "Yahoo Search",
"name": "Yahoo! Danmark",
"keyword": "dk.yahoo.com",
"favicon_url": "https://dk.search.yahoo.com/favicon.ico",
"search_url": "https://dk.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -423,8 +429,18 @@
"id": 2
},
"yahoo_es": {
"yahoo_emea": {
"name": "Yahoo Search",
"keyword": "emea.yahoo.com",
"favicon_url": "https://search.yahoo.com/favicon.ico",
"search_url": "https://emea.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
"suggest_url": "https://emea.search.yahoo.com/sugg/chrome?output=fxjson&appid=crmas&command={searchTerms}",
"type": "SEARCH_ENGINE_YAHOO",
"id": 2
},
"yahoo_es": {
"name": "Yahoo Búsquedas",
"keyword": "es.yahoo.com",
"favicon_url": "https://es.search.yahoo.com/favicon.ico",
"search_url": "https://es.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -434,7 +450,7 @@
},
"yahoo_fi": {
"name": "Yahoo Search",
"name": "Yahoo! Suomi",
"keyword": "fi.yahoo.com",
"favicon_url": "https://fi.search.yahoo.com/favicon.ico",
"search_url": "https://fi.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -443,7 +459,7 @@
},
"yahoo_fr": {
"name": "Yahoo Search",
"name": "Yahoo Recherche",
"keyword": "fr.yahoo.com",
"favicon_url": "https://fr.search.yahoo.com/favicon.ico",
"search_url": "https://fr.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -463,7 +479,7 @@
},
"yahoo_id": {
"name": "Yahoo Search",
"name": "Yahoo! Indonesia",
"keyword": "id.yahoo.com",
"favicon_url": "https://id.search.yahoo.com/favicon.ico",
"search_url": "https://id.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -473,7 +489,7 @@
},
"yahoo_in": {
"name": "Yahoo Search",
"name": "Yahoo! India",
"keyword": "in.yahoo.com",
"favicon_url": "https://in.search.yahoo.com/favicon.ico",
"search_url": "https://in.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -483,7 +499,7 @@
},
"yahoo_it": {
"name": "Yahoo Search",
"name": "Ricerca di Yahoo",
"keyword": "it.yahoo.com",
"favicon_url": "https://it.search.yahoo.com/favicon.ico",
"search_url": "https://it.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -493,7 +509,7 @@
},
"yahoo_jp": {
"name": "Yahoo Search",
"name": "Yahoo! JAPAN",
"keyword": "yahoo.co.jp",
"favicon_url": "https://search.yahoo.co.jp/favicon.ico",
"search_url": "https://search.yahoo.co.jp/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -503,7 +519,7 @@
},
"yahoo_mx": {
"name": "Yahoo Search",
"name": "Yahoo! M\u00e9xico",
"keyword": "mx.yahoo.com",
"favicon_url": "https://mx.search.yahoo.com/favicon.ico",
"search_url": "https://mx.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -513,7 +529,7 @@
},
"yahoo_my": {
"name": "Yahoo Search",
"name": "Yahoo! Malaysia",
"keyword": "malaysia.yahoo.com",
"favicon_url": "https://malaysia.search.yahoo.com/favicon.ico",
"search_url": "https://malaysia.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -523,7 +539,7 @@
},
"yahoo_nl": {
"name": "Yahoo Search",
"name": "Yahoo! Nederland",
"keyword": "nl.yahoo.com",
"favicon_url": "https://nl.search.yahoo.com/favicon.ico",
"search_url": "https://nl.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -533,7 +549,7 @@
},
"yahoo_nz": {
"name": "Yahoo Search",
"name": "Yahoo! New Zealand",
"keyword": "nz.yahoo.com",
"favicon_url": "https://nz.search.yahoo.com/favicon.ico",
"search_url": "https://nz.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -543,7 +559,7 @@
},
"yahoo_pe": {
"name": "Yahoo Search",
"name": "Yahoo! Per\u00fa",
"keyword": "pe.yahoo.com",
"favicon_url": "https://pe.search.yahoo.com/favicon.ico",
"search_url": "https://pe.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -553,7 +569,7 @@
},
"yahoo_ph": {
"name": "Yahoo Search",
"name": "Yahoo! Philippines",
"keyword": "ph.yahoo.com",
"favicon_url": "https://ph.search.yahoo.com/favicon.ico",
"search_url": "https://ph.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -563,7 +579,7 @@
},
"yahoo_se": {
"name": "Yahoo Search",
"name": "Yahoo! Sverige",
"keyword": "se.yahoo.com",
"favicon_url": "https://se.search.yahoo.com/favicon.ico",
"search_url": "https://se.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -572,7 +588,7 @@
},
"yahoo_sg": {
"name": "Yahoo Search",
"name": "Yahoo! Singapore",
"keyword": "sg.yahoo.com",
"favicon_url": "https://sg.search.yahoo.com/favicon.ico",
"search_url": "https://sg.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -582,7 +598,7 @@
},
"yahoo_th": {
"name": "Yahoo Search",
"name": "Yahoo! \u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22",
"keyword": "th.yahoo.com",
"favicon_url": "https://th.search.yahoo.com/favicon.ico",
"search_url": "https://th.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -592,7 +608,7 @@
},
"yahoo_tr": {
"name": "Yahoo Search",
"name": "Yahoo! T\u00fcrkiye",
"keyword": "tr.yahoo.com",
"favicon_url": "https://tr.search.yahoo.com/favicon.ico",
"search_url": "https://tr.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -601,7 +617,7 @@
},
"yahoo_tw": {
"name": "Yahoo Search",
"name": "Yahoo!\u5947\u6469",
"keyword": "tw.yahoo.com",
"favicon_url": "https://tw.search.yahoo.com/favicon.ico",
"search_url": "https://tw.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -621,7 +637,7 @@
},
"yahoo_ve": {
"name": "Yahoo Search",
"name": "Yahoo! Venezuela",
"keyword": "ve.yahoo.com",
"favicon_url": "https://ve.search.yahoo.com/favicon.ico",
"search_url": "https://ve.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -631,7 +647,7 @@
},
"yahoo_vn": {
"name": "Yahoo Search",
"name": "Yahoo! Vi\u1ec7t Nam",
"keyword": "vn.yahoo.com",
"favicon_url": "https://vn.search.yahoo.com/favicon.ico",
"search_url": "https://vn.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
@ -1064,6 +1080,7 @@
"favicon_url": "https://oceanhero.today/favicon.ico",
"search_url": "https://oceanhero.today/web?q={searchTerms}",
"suggest_url": "https://api.oceanhero.today/suggestions?q={searchTerms}",
"new_tab_url": "https://oceanhero.today/home",
"type": "SEARCH_ENGINE_OCEANHERO",
"id": 99
},
@ -1084,6 +1101,7 @@
"favicon_url": "https://www.privacywall.org/images/favicon_32x32.ico",
"search_url": "https://www.privacywall.org/search/secure/?q={searchTerms}",
"suggest_url": "https://search.privacywall.org/suggest.php?q={searchTerms}",
"new_tab_url": "https://www.privacywall.org/newtab/",
"type": "SEARCH_ENGINE_PRIVACYWALL",
"id": 100
},

1468
src/components/search_engines/search_engine_countries-inc.cc Normal file
View file

File diff suppressed because it is too large Load diff

2038
src/components/search_engines/template_url_prepopulate_data.cc
View file

File diff suppressed because it is too large Load diff