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

M115 stage 3

Browse source
This commit is contained in:
Alexander Frick 2023-08-11 02:33:59 -05:00
parent 485b59d3f3
commit 3021d3b692
17 changed files with 251 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
infra/PATCHES.md
View file

@ -175,11 +175,17 @@ Enable double click to close tab flag - https://github.com/bigfoxtail/brave-core
- Found by @gz83, modified by me.
Enable close confirmation patch - https://github.com/ungoogled-software/ungoogled-chromium/blob/master/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
- Modfiied by me.
- Modfied by me.
CFI Ignores Patch - https://github.com/RobRich999/Chromium_Clang/blob/150e755bdb3f2c389ab3d485f38d62a36414e73a/Linux/linux64-avx.patch#L386
- Made by RobRich999
Warn instead of Error on V8 PGO Profile Mismatch Patch - https://github.com/RobRich999/Chromium_Clang/blob/main/V8/v8.patch
- Made by RobRich999
Enable Middle Click Autoscroll on ALL Platforms - https://github.com/Alex313031/thorium/issues/199
- Made by me.
Patches to enable truly Portable usage > Disable Encryption and Machine ID
- https://github.com/ungoogled-software/ungoogled-chromium-windows/blob/master/patches/ungoogled-chromium/windows/windows-disable-encryption.patch
- https://github.com/ungoogled-software/ungoogled-chromium-windows/blob/master/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch

4
other/AVX2/v8/BUILD.gn
View file

@ -2282,7 +2282,9 @@ template("run_mksnapshot") {
# Replace this with --warn-about-builtin-profile-data to see the full
# list of builtins with incompatible profiles.
"--abort-on-bad-builtin-profile-data",
# TODO(crbug.com/v8/13647): Do not fail for invalid profiles
# "--abort-on-bad-builtin-profile-data",
"--warn-about-builtin-profile-data",
]
}

4
other/CrOS/v8/BUILD.gn
View file

@ -2282,7 +2282,9 @@ template("run_mksnapshot") {
# Replace this with --warn-about-builtin-profile-data to see the full
# list of builtins with incompatible profiles.
"--abort-on-bad-builtin-profile-data",
# TODO(crbug.com/v8/13647): Do not fail for invalid profiles
# "--abort-on-bad-builtin-profile-data",
"--warn-about-builtin-profile-data",
]
}

4
other/SSE3/v8/BUILD.gn
View file

@ -2282,7 +2282,9 @@ template("run_mksnapshot") {
# Replace this with --warn-about-builtin-profile-data to see the full
# list of builtins with incompatible profiles.
"--abort-on-bad-builtin-profile-data",
# TODO(crbug.com/v8/13647): Do not fail for invalid profiles
# "--abort-on-bad-builtin-profile-data",
"--warn-about-builtin-profile-data",
]
}

16
src/chrome/browser/ui/ui_features.cc
View file

@ -13,9 +13,10 @@ namespace features {
// Enables the tab dragging fallback when full window dragging is not supported
// by the platform (e.g. Wayland). See https://crbug.com/896640
// TODO: Alex313031 bug fix
BASE_FEATURE(kAllowWindowDragUsingSystemDragDrop,
"AllowWindowDragUsingSystemDragDrop",
base::FEATURE_ENABLED_BY_DEFAULT);
base::FEATURE_DISABLED_BY_DEFAULT);
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kDesktopPWAsAppHomePage,
@ -52,9 +53,10 @@ BASE_FEATURE(kAccessCodeCastUI,
// Enables displaying the submenu to open a link with a different profile if
// there is at least one other active profile.
// TODO: Alex313031 bug fix
BASE_FEATURE(kDisplayOpenLinkAsProfile,
"DisplayOpenLinkAsProfile",
base::FEATURE_ENABLED_BY_DEFAULT);
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables showing the EV certificate details in the Page Info bubble.
BASE_FEATURE(kEvDetailsInPageInfo,
@ -197,21 +199,13 @@ BASE_FEATURE(kTabGroupsCollapseFreezing,
"TabGroupsCollapseFreezing",
base::FEATURE_ENABLED_BY_DEFAULT);
// Directly controls the "new" badge (as opposed to old "master switch"; see
// https://crbug.com/1169907 for master switch deprecation and
// https://crbug.com/968587 for the feature itself)
// https://crbug.com/1173792
BASE_FEATURE(kTabGroupsNewBadgePromo,
"TabGroupsNewBadgePromo",
base::FEATURE_ENABLED_BY_DEFAULT);
// Enables users to explicitly save and recall tab groups.
// https://crbug.com/1223929
BASE_FEATURE(kTabGroupsSave,
"TabGroupsSave",
base::FEATURE_ENABLED_BY_DEFAULT);
// Enables users to explicitly save and recall tab groups.
// Enables users to explicitly save and recall tab groups with sync.
// https://crbug.com/1223929
BASE_FEATURE(kTabGroupsSaveSyncIntegration,
"TabGroupsSaveSyncIntegration",

21
src/chrome/common/chrome_paths_mac.mm
View file

@ -19,11 +19,14 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths_internal.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
namespace {
// Return a retained (NOT autoreleased) NSBundle* as the internal
// implementation of chrome::OuterAppBundle(), which should be the only
// caller.
// Return an NSBundle* as the internal implementation of
// chrome::OuterAppBundle(), which should be the only caller.
NSBundle* OuterAppBundleInternal() {
@autoreleasepool {
if (!base::mac::AmIBundled()) {
@ -33,7 +36,7 @@ NSBundle* OuterAppBundleInternal() {
if (!base::mac::IsBackgroundOnlyProcess()) {
// Shortcut: in the browser process, just return the main app bundle.
return [[NSBundle mainBundle] retain];
return NSBundle.mainBundle;
}
// From C.app/Contents/Frameworks/C.framework/Versions/1.2.3.4, go up five
@ -43,13 +46,13 @@ NSBundle* OuterAppBundleInternal() {
framework_path.DirName().DirName().DirName().DirName().DirName();
NSString* outer_app_dir_ns = base::SysUTF8ToNSString(outer_app_dir.value());
return [[NSBundle bundleWithPath:outer_app_dir_ns] retain];
return [NSBundle bundleWithPath:outer_app_dir_ns];
}
}
char* ProductDirNameForBundle(NSBundle* chrome_bundle) {
@autoreleasepool {
const char* product_dir_name = NULL;
const char* product_dir_name = nullptr;
NSString* product_dir_name_ns =
[chrome_bundle objectForInfoDictionaryKey:@"CrProductDirName"];
@ -81,7 +84,7 @@ std::string ProductDirName() {
// in the main app's bundle because it will be set differently on the canary
// channel, and the autoupdate system dictates that there can be no
// differences between channels within the versioned directory. This would
// normally use base::mac::FrameworkBundle(), but that references the
// normally use base::apple::FrameworkBundle(), but that references the
// framework bundle within the versioned directory. Ordinarily, the profile
// should not be accessed from non-browser processes, but those processes do
// attempt to get the profile directory, so direct them to look in the outer
@ -209,14 +212,12 @@ bool GetGlobalApplicationSupportDirectory(base::FilePath* result) {
}
NSBundle* OuterAppBundle() {
// Cache this. Foundation leaks it anyway, and this should be the only call
// to OuterAppBundleInternal().
static NSBundle* bundle = OuterAppBundleInternal();
return bundle;
}
bool ProcessNeedsProfileDir(const std::string& process_type) {
// For now we have no reason to forbid this on other MacOS as we don't
// For now we have no reason to forbid this on other macOS as we don't
// have the roaming profile troubles there.
return true;
}

47
src/components/autofill_payments_strings.grdp
View file

@ -463,7 +463,7 @@
</if>
<if expr="is_win">
<message name="IDS_PAYMENTS_AUTOFILL_FILLING_MANDATORY_REAUTH" desc="Text that appears in the payments autofill mandatory re-authentication popup, asking the user to authenticate using biometric or device unlock before filling.">
Thorium is trying to verify it's you so it can fill in your payment info.
Google Thorium is trying to verify it's you so it can fill in your payment info.
</message>
</if>
@ -567,6 +567,32 @@
Manage payment methods
</message>
<!-- Mandatory Reauth related strings - start -->
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_NO_THANKS" desc="Text for the cancel button in the mandatory reauth opt-in prompt. If the user clicks this button, mandatory reauth will not be enabled. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
No Thanks
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_ACCEPT" desc="Text for the accept button in the mandatory reauth opt-in prompt. If the user clicks this button, mandatory reauth will be enabled. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
Yes
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_TITLE" desc="Title text for the mandatory reauth opt-in prompt that is displayed to the user after filling in payment method information. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
Always verify?
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_EXPLANATION" desc="Explanation text for the mandatory reauth opt-in prompt that is displayed to the user after filling in payment method information. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
For added security on shared devices, turn on verification every time you pay using autofill.
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_ICON_TOOLTIP" desc="The tooltip message for the omnibox icon for the mandatory reauth opt-in bubble on Desktop. This bubble prompts users if they would like to enroll in mandatory reauth. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
Enable mandatory re-authentication
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_TITLE" desc="Title text for the mandatory reauth confirmation prompt that is displayed to the user after opting into mandatory reauth. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
You're all set
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_EXPLANATION" desc="Explanation text for the mandatory reauth confirmation prompt that is displayed to the user after opting into mandatory reauth. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
Thorium will now verify it's you before filling in payment methods. You can update this at any time in <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK">$1<ex>settings</ex></ph>.
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" desc="A link to the settings page for the mandatory reauth confirmation prompt that is displayed to the user after opting into mandatory reauth. Mandatory reauth requires the user to unlock their device or pass a biometric auth when autofilling payment method information.">
settings
</message>
<!-- virtual cards related strings - start -->
<if expr="not is_ios and not is_android">
<message name="IDS_AUTOFILL_CLOUD_TOKEN_DROPDOWN_OPTION_LABEL" desc="Text shown in the button in the Autofill dropdown menu when a credit card form field is queried, to offer the option to use a virtual card.">
@ -635,7 +661,7 @@
Yes
</message>
<message name="IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_TITLE_LABEL" desc="Title encouraging users to enroll their card to VCN." formatter_data="android_java">
Make it more secure with a virtual card?
Make it more secure with a virtual card next time?
</message>
<message name="IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_CONTENT_LABEL" desc="Text explaining the benefit of enrolling a credit card as a virtual card. Also contains a link to learn more about virtual cards from IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_LEARN_MORE_LINK_LABEL.">
A virtual card hides your actual card to help protect you from potential fraud. <ph name="IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_LEARN_MORE_LINK_LABEL">$1<ex>Learn about virtual cards</ex></ph>
@ -860,12 +886,19 @@
</if>
<!-- Mandatory Reauth related strings -->
<!-- TODO(crbug.com/1427216): Remove translateable tags when strings are approved. -->
<message name="IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_LABEL" translateable="false" desc="Label for a settings page toggle that allows users to control whether or not to add mandatory reauth for payment methods filling." formatter_data="android_java">
Verify it’s you when filling in payment methods
<message name="IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_LABEL" desc="Label for a settings page toggle that allows users to control whether or not to add mandatory reauth for payment methods filling." formatter_data="android_java">
Always verify when using autofill
</message>
<message name="IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_SUBLABEL" translateable="false" desc="Sublabel for a setttings page toggle that allows users to control whether or not to add mandatory reauth for payment methods filling." formatter_data="android_java">
If turned off, you may still be asked to sometimes verify it’s you for security purposes
<message name="IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_SUBLABEL" desc="Sublabel for a setttings page toggle that allows users to control whether or not to add mandatory reauth for payment methods filling." formatter_data="android_java">
When turned off, you may be asked occasionally to verify for security purposes
</message>
<if expr="is_android">
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_SNACKBAR_MESSAGE_TEXT" desc="Text to be displayed in the snackbar shown after opting in mandatory reauth.">
Payment verification settings saved
</message>
<message name="IDS_AUTOFILL_MANDATORY_REAUTH_SNACKBAR_ACTION_TEXT" desc="Text to be displayed as the snackbar action shown after opting in mandatory reauth.">
Settings
</message>
</if>
</grit-part>

3
src/components/autofill_strings.grdp
View file

@ -25,9 +25,6 @@
<message name="IDS_AUTOFILL_WARNING_MIXED_FORM" desc="Warning text shown when autofill is disabled due to a form on a secure site being submitted over an insecure connection.">
This form is not secure. Autofill has been turned off.
</message>
<message name="IDS_AUTOFILL_CREDIT_CARD_SIGNIN_PROMO" desc="Promo text shown alongside credit card suggestions to get people to sign in.">
To use cards from your Google Account, sign in to Thorium
</message>
<if expr="_google_chrome">
<message name="IDS_AUTOFILL_DELETE_AUTOCOMPLETE_SUGGESTION_CONFIRMATION_BODY" desc="Text in a dialog to confirm that the user wants to delete an autocomplete form history suggestion.">
Remove form suggestion from Thorium?

6
src/components/components_chromium_strings.grd
View file

@ -282,12 +282,12 @@
</message>
<message name="IDS_VERSION_UI_LICENSE" desc="The label below the copyright message, containing the URLs.">
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM">&lt;a target="_blank" href="$1"&gt;</ph>Chromium<ph name="END_LINK_CHROMIUM">&lt;/a&gt;</ph> open source project and other <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$2"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM">&lt;a target="_blank" href="$1"&gt;</ph>Thorium<ph name="END_LINK_CHROMIUM">&lt;/a&gt;</ph> open source project and other <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$2"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
</message>
<if expr="chromeos_ash">
<message name="IDS_VERSION_UI_LICENSE_CHROMIUM" desc="The label below the copyright message, containing the link to the Chromium project.">
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM">&lt;a target="_blank" href="$1"&gt;</ph>Chromium<ph name="END_LINK_CHROMIUM">&lt;/a&gt;</ph> open source project.
<message name="IDS_VERSION_UI_LICENSE_CHROMIUM" desc="The label below the copyright message, containing the link to the Thorium project.">
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM">&lt;a target="_blank" href="$1"&gt;</ph>Thorium<ph name="END_LINK_CHROMIUM">&lt;/a&gt;</ph> open source project.
</message>
<message name="IDS_VERSION_UI_LICENSE_OTHER" desc="The label below the copyright message, containing the link to other open source software.">

18
src/components/error_page_strings.grdp
View file

@ -55,7 +55,7 @@
</message>
<message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY" desc="When a page fails to load, sometimes we suggest checking the network connections. This contains details below the suggestion.">
Check any cables and reboot any routers, modems, or other network
devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly.
devices you may be using.
</message>
<if expr="not is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_SECURE_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the secure DNS configuration. This is a header above above some details.">
@ -122,9 +122,15 @@
<message name="IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED" desc="Heading of the error page when the network connection failed.">
No internet
</message>
<message name="IDS_ERRORPAGES_HEADING_YOU_ARE_OFFLINE" desc="Heading of the error page for when a PWA/TWA is offline.">
<message name="IDS_ERRORPAGES_HEADING_YOU_ARE_OFFLINE" desc="Message of the error page for when a PWA/TWA/IWA is offline.">
You're offline
</message>
<message name="IDS_ERRORPAGES_MESSAGE_IWA_INVALID_WEB_BUNDLE" desc="Message of the error page for when an IWA has invalid web bundle.">
This application is missing or damaged
</message>
<message name="IDS_ERRORPAGES_MESSAGE_IWA_CONNECTION_REFUSED" desc="Message of the error page for when an IWA can't connect to dev server.">
The development server for this application cannot be reached
</message>
<message name="IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE" desc="Heading in the error page when we encountered an error reading from the cache. Generally this happens when the disk cache is corrupted from improper shutdown.">
This site can’t be loaded from the cache
</message>
@ -261,7 +267,7 @@
This page has been blocked by an extension
</message>
<message name="IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR" desc="Summary in the error page when an administrator policy blocks a request.">
The person who set up this computer has chosen to block this site.
Your organization doesn’t allow you to view this site
</message>
<message name="IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_SECURITY" desc="Summary in the error page when the request has been blocked because of some security configuration of the site.">
@ -375,7 +381,7 @@
</if>
<if expr="is_android or is_ios">
<message name="IDS_ERRORPAGES_GAME_INSTRUCTIONS" desc="Mobile: Instructions on how to start playing the offline game. 'dino' is an acceptable English nickname that refers to 'dinosaur'">
Tap the Dino to play
Tap the dino to play
</message>
<message name="IDS_ERRORPAGE_DINO_GAME_DESCRIPTION" desc="Message to be spoken by a screen reader to give the user context and instructions for playing the net error dino game. Tapping the screen activates the game and causes the dinosaur to jump. Mobile platforms only.">
Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, tap to jump over obstacles.
@ -383,7 +389,7 @@
</if>
<if expr="not is_android and not is_ios">
<message name="IDS_ERRORPAGES_GAME_INSTRUCTIONS" desc="Instructions on how to start playing the offline game.">
Press Space or the Up Arrow to Play
Press space to play
</message>
<message name="IDS_ERRORPAGE_DINO_GAME_DESCRIPTION" desc="Message to be spoken by a screen reader to give the user context and instructions for playing the net error dino game. Pressing space activates the game and causes the dinosaur to jump. Desktop platforms only.">
Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, press space to jump over obstacles.
@ -405,6 +411,6 @@
Jump!
</message>
<message name="IDS_ERRORPAGE_DINO_SLOW_SPEED_TOGGLE" desc="Label for a toggle which allows a user to select a slower speed for the dino game.">
Start slower&#63;
Start slower
</message>
</grit-part>

16
src/components/page_info_strings.grdp
View file

@ -337,11 +337,8 @@
<message name="IDS_PAGE_INFO_STATE_TEXT_ALLOWED" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the permission is allowed by any source (the user, the administrator, etc.).">
Allowed
</message>
<message name="IDS_PAGE_INFO_STATE_TEXT_ALLOWED_ONCE_ONE_TAB" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the permission is allowed once by any source (the user, the administrator, etc.) and there is only one tab opened for the site.">
Allowed until you close this tab
</message>
<message name="IDS_PAGE_INFO_STATE_TEXT_ALLOWED_ONCE_MULTIPLE_TAB" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the permission is allowed once by any source (the user, the administrator, etc.) and there are nultiple tabs opened for the site.">
Allowed until you close tabs for this site
<message name="IDS_PAGE_INFO_STATE_TEXT_ALLOWED_ONCE" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the permission is allowed once by any source (the user, the administrator, etc.).">
Only this time
</message>
<message name="IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the permission is not allowed (blocked or ask state) by any source (the user, the administrator, etc.).">
Not allowed
@ -369,6 +366,10 @@
<message name="IDS_PAGE_INFO_SELECTOR_TOOLTIP" desc="The text of the tooltip on the page info selector.">
Select permission for <ph name="PERMISSION_NAME">$1<ex>Location</ex></ph>
</message>
<message name="IDS_PAGE_INFO_STORAGE_ACCESS_SECONDARY_TEXT" translateable="false" desc="Text highlighting which site is requesting a permission.">
For <ph name="DOMAIN">$1<ex>example.com</ex></ph>
</message>
<!-- Permission ask strings -->
<message name="IDS_PAGE_INFO_STATE_TEXT_AR_ASK" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the AR permission is in the ask state and the site can prompt the user to ask if they want to allow the site to track their camera position.">
@ -428,6 +429,9 @@
<message name="IDS_PAGE_INFO_STATE_TEXT_BLUETOOTH_SCANNING_ASK" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the bluetooth scanning permission is in the ask state and the site can prompt the user to ask if they allow the site to discover nearby Bluetooth devices.">
Can ask to discover nearby Bluetooth devices
</message>
<message name="IDS_PAGE_INFO_STATE_TEXT_STORAGE_ACCESS_ASK" translateable="false" desc="The Page Info permission subpage and the main page info page contain a label which shows the state of the site permission. This is the text shown if the storage access permission is in the ask state and the site can prompt the user to ask if they allow the site to access cookies.">
Can ask to access cookies
</message>
<!-- UI for device access granted to the site using the device chooser (e.g. USB, Bluetooth) -->
<message name="IDS_PAGE_INFO_USB_DEVICE_SECONDARY_LABEL" desc="The label displayed underneath the device name to inform the user that the item refers to a USB device.">
@ -657,7 +661,7 @@
Go to permission settings
</message>
<message name="IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_REMEMBER_THIS_SETTING" desc="The text near the checkbox, that controls if user's decision will be remembered for this permission, in permission's subpage in page info bubble.">
Remember this setting
Allow on every visit
</message>
<message name="IDS_PAGE_INFO_RESET_PERMISSIONS" desc="The label of the button to reset permissions for a site.">
{NUM_PERMISSIONS, plural, =1 {Reset permission} other {Reset permissions}}

3
src/components/security_interstitials_strings.grdp
View file

@ -537,6 +537,9 @@
<message name="IDS_HTTPS_ONLY_MODE_WITH_ADVANCED_PROTECTION_PRIMARY_PARAGRAPH" desc="Main paragraph of the HTTPS-Only Mode warning. This warning is shown when the browser tries to upgrade a navigation to a site to HTTPS but the site does not support HTTPS. The user also has Advanced Protection enabled.">
You are seeing this warning because this site does not support HTTPS and you are under Google's Advanced Protection Program. <ph name="BEGIN_LEARN_MORE_LINK">&lt;a href="#" id="learn-more-link"&gt;</ph>Learn more<ph name="END_LEARN_MORE_LINK">&lt;/a&gt;</ph>
</message>
<message name="IDS_HTTPS_ONLY_MODE_WITH_SITE_ENGAGEMENT_PRIMARY_PARAGRAPH" desc="Main paragraph of the HTTPS-Only Mode warning. This warning is shown when the browser tries to upgrade a navigation to a site to HTTPS but the site does not support HTTPS. The user has previously engaged with the HTTPS version of the site.">
You usually connect to this site securely, but Thorium couldn't use a secure connection this time. An attacker might be trying to eavesdrop or modify your network connection. <ph name="BEGIN_LEARN_MORE_LINK">&lt;a href="#" id="learn-more-link"&gt;</ph>Learn more<ph name="END_LEARN_MORE_LINK">&lt;/a&gt;</ph>
</message>
<message name="IDS_HTTPS_ONLY_MODE_BACK_BUTTON" desc="Text for the button in the HTTPS-only mode warning that takes the user back to the previous page">
Go back
</message>

176
src/third_party/blink/common/features.cc vendored
View file

@ -289,25 +289,11 @@ constexpr base::FeatureParam<bool> kPrivateAggregationApiEnabledInFledge{
&kPrivateAggregationApi, "enabled_in_fledge",
/*default_value=*/true};
// Selectively allows the FLEDGE-specific extensions to be disabled.
// Selectively allows the Protected Audience-specific extensions to be disabled.
constexpr base::FeatureParam<bool>
kPrivateAggregationApiFledgeExtensionsEnabled{&kPrivateAggregationApi,
"fledge_extensions_enabled",
/*default_value=*/false};
// Maximum budget allowed to be claimed per-origin per-day per-API. See
// `content::PrivateAggregationBudgeter` for more detail.
constexpr base::FeatureParam<int> kPrivateAggregationApiMaxBudgetPerScope{
&kPrivateAggregationApi, "max_budget_per_scope", /*default_value=*/65536};
// Has the same effect as enabling
// kPrivateAggregationApiFledgeExtensionsEnabled. This is intended as a
// convenience for local testing only.
// TODO(alexmt): Remove when kPrivateAggregationApiFledgeExtensionsEnabled is
// enabled by default.
BASE_FEATURE(kPrivateAggregationApiFledgeExtensionsLocalTestingOverride,
"PrivateAggregationApiFledgeExtensionsLocalTestingOverride",
base::FEATURE_DISABLED_BY_DEFAULT);
/*default_value=*/true};
// Enable the shared storage API. Note that enabling this feature does not
// automatically expose this API to the web, it only allows the element to be
@ -352,7 +338,7 @@ const base::FeatureParam<int>
BASE_FEATURE(kSharedStorageSelectURLLimit,
"SharedStorageSelectURLLimit",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
const base::FeatureParam<int> kSharedStorageSelectURLBitBudgetPerPageLoad = {
&kSharedStorageSelectURLLimit, "SharedStorageSelectURLBitBudgetPerPageLoad",
12};
@ -361,10 +347,6 @@ const base::FeatureParam<int>
&kSharedStorageSelectURLLimit,
"SharedStorageSelectURLBitBudgetPerOriginPerPageLoad", 6};
BASE_FEATURE(kPrerender2SequentialPrerendering,
"Prerender2SequentialPrerendering",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kPrerender2MainFrameNavigation,
"Prerender2MainFrameNavigation",
base::FEATURE_ENABLED_BY_DEFAULT);
@ -646,6 +628,81 @@ const base::FeatureParam<ForceDarkImageClassifier>
ForceDarkImageClassifier::kUseBlinkSettings,
&forcedark_image_classifier_policy_options};
// Enable service worker warming-up feature. (https://crbug.com/1431792)
BASE_FEATURE(kSpeculativeServiceWorkerWarmUp,
"SpeculativeServiceWorkerWarmUp",
base::FEATURE_DISABLED_BY_DEFAULT);
// If true, do not actually warm-up service workers.
const base::FeatureParam<bool> kSpeculativeServiceWorkerWarmUpDryRun{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_dry_run", false};
// kSpeculativeServiceWorkerWarmUp observes anchor events such as visibility,
// pointerover, and pointerdown. These events could be triggered very often. To
// reduce the frequency of processing, kSpeculativeServiceWorkerWarmUp uses a
// timer to batch URL candidates together for this amount of duration.
const base::FeatureParam<base::TimeDelta>
kSpeculativeServiceWorkerWarmUpBatchTimer{&kSpeculativeServiceWorkerWarmUp,
"sw_warm_up_batch_timer",
base::Milliseconds(100)};
// kSpeculativeServiceWorkerWarmUp warms up service workers up to this max
// count.
const base::FeatureParam<int> kSpeculativeServiceWorkerWarmUpMaxCount{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_max_count", 10};
// kSpeculativeServiceWorkerWarmUp remembers recent warm-up requests to prevent
// excessive duplicate warm-up. The following cache size is the cache size for
// duplicated request checks.
const base::FeatureParam<int> kSpeculativeServiceWorkerWarmUpRequestCacheSize{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_request_cache_size", 1000};
// kSpeculativeServiceWorkerWarmUp enqueues navigation candidate URLs. This is
// the queue length of the candidate URLs.
const base::FeatureParam<int> kSpeculativeServiceWorkerWarmUpRequestQueueLength{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_request_queue_length", 1000};
// kSpeculativeServiceWorkerWarmUp accept requests of navigation candidate URLs.
// This is the request count limit per document.
const base::FeatureParam<int> kSpeculativeServiceWorkerWarmUpRequestLimit{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_request_limit", 1000};
// Duration to keep worker warmed-up.
const base::FeatureParam<base::TimeDelta>
kSpeculativeServiceWorkerWarmUpDuration{&kSpeculativeServiceWorkerWarmUp,
"sw_warm_up_duration",
base::Minutes(10)};
// Duration to re-warmup service worker. This duration must be shorter than
// sw_warm_up_duration.
const base::FeatureParam<base::TimeDelta>
kSpeculativeServiceWorkerWarmUpReWarmUpThreshold{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_re_warm_up_threshold",
base::Minutes(7)};
// Enable IntersectionObserver to detect anchor's visibility.
const base::FeatureParam<bool>
kSpeculativeServiceWorkerWarmUpIntersectionObserver{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_intersection_observer",
true};
// Duration from previous IntersectionObserver event to the next event.
const base::FeatureParam<int>
kSpeculativeServiceWorkerWarmUpIntersectionObserverDelay{
&kSpeculativeServiceWorkerWarmUp,
"sw_warm_up_intersection_observer_delay", 100};
// Warms up service workers when the anchor becomes visible.
const base::FeatureParam<bool> kSpeculativeServiceWorkerWarmUpOnVisible{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_on_visible", true};
// Warms up service workers when a pointerover event is triggered on an anchor.
const base::FeatureParam<bool> kSpeculativeServiceWorkerWarmUpOnPointerover{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_on_pointerover", true};
// Warms up service workers when a pointerdown event is triggered on an anchor.
const base::FeatureParam<bool> kSpeculativeServiceWorkerWarmUpOnPointerdown{
&kSpeculativeServiceWorkerWarmUp, "sw_warm_up_on_pointerdown", true};
// Instructs WebRTC to honor the Min/Max Video Encode Accelerator dimensions.
BASE_FEATURE(kWebRtcUseMinMaxVEADimensions,
"WebRtcUseMinMaxVEADimensions",
@ -744,6 +801,13 @@ BASE_FEATURE(kCanvasFreeMemoryWhenHidden,
"CanvasFreeMemoryWhenHidden",
base::FEATURE_ENABLED_BY_DEFAULT);
// Whether to use 'TexImage2D' instead of 'TexStorage2DEXT' when creating a
// staging texture for |DrawingBuffer|. This is a killswitch; remove when
// launched.
BASE_FEATURE(kUseImageInsteadOfStorageForStagingBuffer,
"UseImageInsteadOfStorageForStagingBuffer",
base::FEATURE_ENABLED_BY_DEFAULT);
// When enabled, add a new option, {imageOrientation: 'none'}, to
// createImageBitmap, which ignores the image orientation metadata of the source
// and renders the image as encoded.
@ -768,7 +832,7 @@ BASE_FEATURE(kProduceCompileHints,
const base::FeatureParam<int> kProduceCompileHintsOnIdleDelayParam{
&kProduceCompileHints, "delay-in-ms", 10000};
const base::FeatureParam<double> kProduceCompileHintsNoiseLevel{
&kProduceCompileHints, "noise probability", 0.9};
&kProduceCompileHints, "noise probability", 0.5};
// Enables the JPEG XL Image File Format (JXL).
BASE_FEATURE(kJXL, "JXL", base::FEATURE_ENABLED_BY_DEFAULT);
@ -816,10 +880,6 @@ BASE_FEATURE(kResamplingInputEvents,
"ResamplingInputEvents",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kInputTargetClientHighPriority,
"InputTargetClientHighPriority",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kResamplingScrollEvents,
"ResamplingScrollEvents",
base::FEATURE_ENABLED_BY_DEFAULT);
@ -943,6 +1003,12 @@ BASE_FEATURE(kWebAppBorderless,
"WebAppBorderless",
base::FEATURE_DISABLED_BY_DEFAULT);
// Allows web apps to customize their tab strip. See explainer for more detail:
// https://github.com/WICG/manifest-incubations/blob/gh-pages/tabbed-mode-explainer.md
BASE_FEATURE(kDesktopPWAsTabStripCustomizations,
"DesktopPWAsTabStripCustomizations",
base::FEATURE_DISABLED_BY_DEFAULT);
// Makes network loading tasks unfreezable so that they can be processed while
// the page is frozen.
BASE_FEATURE(kLoadingTasksUnfreezable,
@ -991,6 +1057,12 @@ const base::FeatureParam<int> kInterestGroupStorageMaxOpsBeforeMaintenance{
// Enables FLEDGE implementation. See https://crbug.com/1186444.
BASE_FEATURE(kFledge, "Fledge", base::FEATURE_DISABLED_BY_DEFAULT);
// See
// https://github.com/WICG/turtledove/blob/main/FLEDGE_browser_bidding_and_auction_API.md
BASE_FEATURE(kFledgeBiddingAndAuctionServer,
"FledgeBiddingAndAuctionServer",
base::FEATURE_DISABLED_BY_DEFAULT);
// See in the header.
BASE_FEATURE(kFledgeConsiderKAnonymity,
"FledgeConsiderKAnonymity",
@ -1085,12 +1157,13 @@ const base::FeatureParam<int>
// multiple configurations as long as they are compatible (from both Chrome's
// and users/websites' perspective). For a configuration that's incompatible
// with previous ones, a new dedicated version number should be used.
const base::FeatureParam<int> kBrowsingTopicsConfigVersion{&kBrowsingTopics,
"config_version", 1};
const base::FeatureParam<int> kBrowsingTopicsConfigVersion{
&kBrowsingTopics, "config_version", kBrowsingTopicsConfigVersionDefault};
// The taxonomy version. This only affects the topics classification that occurs
// during this browser session, and doesn't affect the pre-existing epochs.
const base::FeatureParam<int> kBrowsingTopicsTaxonomyVersion{
&kBrowsingTopics, "taxonomy_version", 1};
&kBrowsingTopics, "taxonomy_version",
kBrowsingTopicsTaxonomyVersionDefault};
const base::FeatureParam<std::string> kBrowsingTopicsDisabledTopicsList{
&kBrowsingTopics, "browsing_topics_disabled_topics_list", ""};
@ -1505,7 +1578,7 @@ BASE_FEATURE(kFileSystemUrlNavigation,
BASE_FEATURE(kFileSystemUrlNavigationForChromeAppsOnly,
"FileSystemUrlNavigationForChromeAppsOnly",
base::FEATURE_ENABLED_BY_DEFAULT);
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kEarlyExitOnNoopClassOrStyleChange,
"EarlyExitOnNoopClassOrStyleChange",
@ -1546,6 +1619,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent,
BASE_FEATURE(kWebRtcEncoderAsyncEncode,
"WebRtcEncoderAsyncEncode",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kWebRtcInitializeEncoderOnFirstFrame,
"WebRtcInitializeEncoderOnFirstFrame",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kWebRtcThreadsUseResourceEfficientType,
@ -1582,7 +1659,7 @@ BASE_FEATURE(kFastPathPaintPropertyUpdates,
BASE_FEATURE(kThrottleOffscreenAnimatingSvgImages,
"ThrottleOffscreenAnimatingSvgImages",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kThreadedBodyLoader,
"ThreadedBodyLoader",
@ -1639,6 +1716,17 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread,
"WebRtcCombinedNetworkAndWorkerThread",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kVSyncDecoding,
"VSyncDecoding",
base::FEATURE_DISABLED_BY_DEFAULT);
const base::FeatureParam<base::TimeDelta>
kVSyncDecodingHiddenOccludedTickDuration{
&kVSyncDecoding, "occluded_tick_duration", base::Hertz(10)};
BASE_FEATURE(kWebRtcSendPacketBatch,
"WebRtcSendPacketBatch",
base::FEATURE_DISABLED_BY_DEFAULT);
// Allow process isolation of iframes with the 'sandbox' attribute set. Whether
// or not such an iframe will be isolated may depend on options specified with
// the attribute. Note: At present, only iframes with origin-restricted
@ -1712,14 +1800,17 @@ BASE_FEATURE(kSpeculationRulesPrefetchFuture,
"SpeculationRulesPrefetchFuture",
base::FEATURE_ENABLED_BY_DEFAULT);
// TODO(https://crbug.com/1331187): Delete the flag.
BASE_FEATURE(kAllowPageWithIDBConnectionInBFCache,
"AllowPageWithIDBConnectionInBFCache",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
// TODO(https://crbug.com/1331187): Delete the flag.
BASE_FEATURE(kAllowPageWithIDBTransactionInBFCache,
"AllowPageWithIDBTransactionInBFCache",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
// TODO(https://crbug.com/1331187): Delete the function.
bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
return base::FeatureList::IsEnabled(kAllowPageWithIDBConnectionInBFCache) &&
base::FeatureList::IsEnabled(kAllowPageWithIDBTransactionInBFCache);
@ -1749,7 +1840,7 @@ const base::FeatureParam<int> kMaxFCPDelayMsForRenderBlockingFonts(
BASE_FEATURE(kWebRtcStatsReportIdl,
"WebRtcStatsReportIdl",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kQuoteEmptySecChUaStringHeadersConsistently,
"QuoteEmptySecChUaStringHeadersConsistently",
@ -1769,6 +1860,11 @@ BASE_FEATURE(kDisableThirdPartyStoragePartitioningDeprecationTrial,
BASE_FEATURE(kRuntimeFeatureStateControllerApplyFeatureDiff,
"RuntimeFeatureStateControllerApplyFeatureDiff",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kGb18030_2022Enabled,
"Gb18030_2022Enabled",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kURLSetPortCheckOverflow,
"URLSetPortCheckOverflow",
base::FEATURE_DISABLED_BY_DEFAULT);
@ -1801,5 +1897,17 @@ BASE_FEATURE(kGainmapHdrImages,
"GainmapHdrImages",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kMainThreadHighPriorityImageLoading,
"MainThreadHighPriorityImageLoading",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kDirectCompositorThreadIpc,
"DirectCompositorThreadIpc",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAllowDevToolsMainThreadDebuggerForMultipleMainFrames,
"AllowDevToolsMainThreadDebuggerForMultipleMainFrames",
base::FEATURE_ENABLED_BY_DEFAULT);
} // namespace features
} // namespace blink

1
src/third_party/blink/renderer/platform/runtime_enabled_features.json5 vendored
View file

@ -2281,6 +2281,7 @@
name: "MiddleClickAutoscroll",
status: "test",
base_feature: "none",
base_feature_status: "enabled",
},
{

3
src/ui/chromeos/ui_chromeos_strings.grd
View file

@ -636,6 +636,9 @@
<message name="IDS_CHROMEOS_IME_INFOLIST_WINDOW_TITLE" desc="The title of the infolist window where the meanings and the usages of words are displayed.">
Information
</message>
<message name="IDS_CHROMEOS_DIACRITIC_NUDGE_TEXT">
Want keys to repeat? Turn off accent marks in Keyboard Settings
</message>
<message name="IDS_CHROMEOS_IME_CHINESE_QUICK_SETTINGS_CHINESE" desc="It is the description of whether the current input method is Chinese.">
Input language is Chinese
</message>

4
src/v8/BUILD.gn
View file

@ -2282,7 +2282,9 @@ template("run_mksnapshot") {
# Replace this with --warn-about-builtin-profile-data to see the full
# list of builtins with incompatible profiles.
"--abort-on-bad-builtin-profile-data",
# TODO(crbug.com/v8/13647): Do not fail for invalid profiles
# "--abort-on-bad-builtin-profile-data",
"--warn-about-builtin-profile-data",
]
}

2
trunk.sh
View file

@ -77,7 +77,7 @@ cd ${CR_SRC_DIR} &&
gclient sync --with_branch_heads --with_tags -f -R -D &&
printf "\n" &&
printf "${GRE}Done! ${YEL}You can now run \'./VERSION.sh\'\n" &&
printf "${GRE}Done! ${YEL}You can now run \'./version.sh\'\n" &&
tput sgr0 &&
c0='\033[0m' # Reset Text