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

M120 stage 1

Browse source
This commit is contained in:
Alexander Frick 2024-01-22 09:50:33 -06:00
parent 571ed066b3
commit 824da75edc
14 changed files with 84 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.
@ -33,7 +33,6 @@
#include "chrome/browser/background/background_application_list_model.h"
#include "chrome/browser/background/background_mode_optimizer.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/lifetime/application_lifetime_desktop.h"
#include "chrome/browser/lifetime/browser_shutdown.h"

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

2
src/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
View file

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.
@ -21,12 +21,14 @@
#include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/startup/startup_types.h"
#include "chrome/browser/ui/startup/test_third_party_cookie_phaseout_infobar_delegate.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/infobars/content/content_infobar_manager.h"
#include "components/prefs/pref_service.h"
#include "content/public/common/content_switches.h"
#include "google_apis/google_api_keys.h"
#include "services/network/public/cpp/network_switches.h"
#if BUILDFLAG(CHROME_FOR_TESTING)
#include "chrome/browser/ui/startup/chrome_for_testing_infobar_delegate.h"
@ -102,6 +104,11 @@ void AddInfoBarsIfNecessary(Browser* browser,
switches::kProtectedAudiencesConsentedDebugToken)) {
BiddingAndAuctionConsentedDebuggingDelegate::Create(web_contents);
}
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
network::switches::kTestThirdPartyCookiePhaseout)) {
TestThirdPartyCookiePhaseoutInfoBarDelegate::Create(web_contents);
}
}
// Do not show any other info bars in Kiosk mode, because it's unlikely that

2
src/chrome/installer/launcher_support/chrome_launcher_support.cc
View file

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

8
src/chrome/installer/linux/BUILD.gn
View file

@ -1,4 +1,4 @@
# Copyright 2023 The Chromium Authors and Alex313031. All rights reserved.
# 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.
@ -628,9 +628,3 @@ template("linux_package") {
linux_package("stable") {
channel = "stable"
}
# linux_package("beta") {
# channel = "beta"
# }
# linux_package("unstable") {
# channel = "unstable"
# }

17
src/chrome/installer/mini_installer/chrome.release
View file

@ -1,4 +1,4 @@
# Copyright 2023 The Chromium Authors, Alex313031, ltguillaume, and gz83
# Copyright 2024 The Chromium Authors, Alex313031, ltguillaume, and gz83
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@ -40,9 +40,6 @@ icudtl.dat: %(VersionDir)s\
libEGL.dll: %(VersionDir)s\
libGLESv2.dll: %(VersionDir)s\
mojo_core.dll: %(VersionDir)s\
nacl64.exe: %(VersionDir)s\
nacl_irt_x86_32.nexe: %(VersionDir)s\
nacl_irt_x86_64.nexe: %(VersionDir)s\
notification_helper.exe: %(VersionDir)s\
optimization_guide_internal.dll: %(VersionDir)s\
resources.pak: %(VersionDir)s\
@ -131,6 +128,18 @@ SmallLogoBeta.png: %(VersionDir)s\VisualElements\
SmallLogoCanary.png: %(VersionDir)s\VisualElements\
SmallLogoDev.png: %(VersionDir)s\VisualElements\
#
# Widevine CDM sub-dir
#
WidevineCdm\manifest.json: %(VersionDir)s\WidevineCdm\
WidevineCdm\LICENSE: %(VersionDir)s\WidevineCdm\
WidevineCdm\_platform_specific\win_x86\widevinecdm.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_x86\
WidevineCdm\_platform_specific\win_x86\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_x86\
WidevineCdm\_platform_specific\win_x64\widevinecdm.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_x64\
WidevineCdm\_platform_specific\win_x64\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_x64\
WidevineCdm\_platform_specific\win_arm64\widevinecdm.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_arm64\
WidevineCdm\_platform_specific\win_arm64\widevinecdm.dll.sig: %(VersionDir)s\WidevineCdm\_platform_specific\win_arm64\
[SNAPSHOTBLOB]
# The snapshot_blob.bin V8 snapshot is needed in builds that don't use
# v8_context_snapshot.bin, such as Linux-Windows cross-builds.

2
src/chrome/installer/mini_installer/mini_installer_exe_main.cc
View file

@ -1,4 +1,4 @@
// Copyright 2022 The Chromium Authors and Alex313031. All rights reserved.
// 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.

2
src/components/download/public/common/download_features.cc
View file

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.
@ -22,9 +22,40 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterTimePref(prefs::kTrackingProtectionOnboardedSince,
base::Time());
registry->RegisterTimePref(prefs::kTrackingProtectionNoticeLastShown,
base::Time());
registry->RegisterTimePref(prefs::kTrackingProtectionOnboardingAckedSince,
base::Time());
registry->RegisterBooleanPref(prefs::kTrackingProtectionOnboardingAcked,
false);
registry->RegisterIntegerPref(
prefs::kTrackingProtectionOnboardingAckAction,
static_cast<int>(TrackingProtectionOnboardingAckAction::kNotSet));
// Offboarding
registry->RegisterBooleanPref(prefs::kTrackingProtectionOffboarded, false);
registry->RegisterTimePref(prefs::kTrackingProtectionOffboardedSince,
base::Time());
registry->RegisterIntegerPref(
prefs::kTrackingProtectionOffboardingAckAction,
static_cast<int>(TrackingProtectionOnboardingAckAction::kNotSet));
// Silent onboarding
registry->RegisterIntegerPref(
prefs::kTrackingProtectionSilentOnboardingStatus,
static_cast<int>(TrackingProtectionOnboardingStatus::kIneligible));
registry->RegisterTimePref(prefs::kTrackingProtectionSilentEligibleSince,
base::Time());
registry->RegisterTimePref(prefs::kTrackingProtectionSilentOnboardedSince,
base::Time());
// Tracking Protection Settings Prefs
registry->RegisterBooleanPref(
prefs::kBlockAll3pcToggleEnabled, false,
@ -37,6 +68,17 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
// Sentiment Survey
registry->RegisterIntegerPref(
prefs::kTrackingProtectionSentimentSurveyGroup,
static_cast<int>(TrackingProtectionSentimentSurveyGroup::kNotSet));
registry->RegisterTimePref(prefs::kTrackingProtectionSentimentSurveyStartTime,
base::Time());
registry->RegisterTimePref(prefs::kTrackingProtectionSentimentSurveyEndTime,
base::Time());
}
} // namespace privacy_sandbox::tracking_protection

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031 and tomByrer.
// Copyright 2024 The Chromium Authors and Alex313031 and tomByrer
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE 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": 144
"kCurrentDataVersion": 146
},
// The following engines are included in country lists and are added to the
@ -74,9 +74,9 @@
},
"brave": {
"name": "Brave",
"keyword": "brave.com",
"favicon_url": "https://brave.com/static-assets/images/brave-favicon.png",
"name": "Brave Search",
"keyword": "search.brave.com",
"favicon_url": "https://cdn.search.brave.com/serp/favicon.ico",
"search_url": "https://search.brave.com/search?q={searchTerms}",
"suggest_url": "https://search.brave.com/api/suggest?q={searchTerms}",
"type": "SEARCH_ENGINE_BRAVE",
@ -127,7 +127,7 @@
"google": {
"name": "Google",
"keyword": "google.com",
"favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
"favicon_url": "https://www.google.com/images/branding/product/ico/googleg_alldp.ico",
"search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
"suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
"image_url": "{google:baseSearchByImageURL}upload",

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

@ -1,4 +1,4 @@
// Copyright 2023 The Chromium Authors and Alex313031
// 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.
@ -1753,6 +1753,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion, -1);
registry->RegisterInt64Pref(
prefs::kDefaultSearchProviderChoiceScreenRandomShuffleSeed, 0);
registry->RegisterBooleanPref(
prefs::kDefaultSearchProviderKeywordsUseExtendedList, false);
}
int GetDataVersion(PrefService* prefs) {
@ -1782,7 +1784,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
// returned list if it's not already there.
const TemplateURL* default_search_engine =
template_url_service->GetDefaultSearchProvider();
if (!base::Contains(t_urls, default_search_engine->prepopulate_id(),
if (default_search_engine &&
!base::Contains(t_urls, default_search_engine->prepopulate_id(),
[](const std::unique_ptr<TemplateURLData>& engine) {
return engine->prepopulate_id;
})) {