diff --git a/arm/build/config/win/BUILD.gn b/arm/build/config/win/BUILD.gn
index 0c17243d..801fca0b 100644
--- a/arm/build/config/win/BUILD.gn
+++ b/arm/build/config/win/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Chromium Authors and Alex313031. All rights reserved.
+# Copyright 2023 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.
@@ -43,9 +43,7 @@ declare_args() {
use_clang_diagnostics_format = false
# Indicates whether to use /pdbpagesize:8192 to allow PDBs larger than 4 GiB.
- # This requires updated debugging and profiling tools which are not widely
- # distributed yet which is why it is currently opt-in.
- use_large_pdbs = false
+ use_large_pdbs = true
}
# This is included by reference in the //build/config/compiler config that
@@ -188,7 +186,10 @@ config("compiler") {
if (use_large_pdbs) {
# This allows PDBs up to 8 GiB in size. This requires lld-link.exe or
# link.exe from VS 2022 or later.
- ldflags += [ "/pdbpagesize:8192" ]
+ if (!defined(configs)) {
+ configs = []
+ }
+ configs += [ ":pdb_larger_than_4gb" ]
}
if (!is_debug && !is_component_build) {
@@ -307,7 +308,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=NTDDI_WIN10_FE",
+ "NTDDI_VERSION=NTDDI_WIN10_NI",
# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
diff --git a/other/AVX2/build/config/win/BUILD.gn b/other/AVX2/build/config/win/BUILD.gn
index 9e5a6c0f..a0ff64a0 100644
--- a/other/AVX2/build/config/win/BUILD.gn
+++ b/other/AVX2/build/config/win/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Chromium Authors and Alex313031. All rights reserved.
+# Copyright 2023 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.
@@ -43,9 +43,7 @@ declare_args() {
use_clang_diagnostics_format = false
# Indicates whether to use /pdbpagesize:8192 to allow PDBs larger than 4 GiB.
- # This requires updated debugging and profiling tools which are not widely
- # distributed yet which is why it is currently opt-in.
- use_large_pdbs = false
+ use_large_pdbs = true
}
# This is included by reference in the //build/config/compiler config that
@@ -194,7 +192,10 @@ config("compiler") {
if (use_large_pdbs) {
# This allows PDBs up to 8 GiB in size. This requires lld-link.exe or
# link.exe from VS 2022 or later.
- ldflags += [ "/pdbpagesize:8192" ]
+ if (!defined(configs)) {
+ configs = []
+ }
+ configs += [ ":pdb_larger_than_4gb" ]
}
if (!is_debug && !is_component_build) {
@@ -314,7 +315,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=NTDDI_WIN10_FE",
+ "NTDDI_VERSION=NTDDI_WIN10_NI",
# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
diff --git a/other/SSE2/build/config/win/BUILD.gn b/other/SSE2/build/config/win/BUILD.gn
index e93e2386..bdbfab0d 100644
--- a/other/SSE2/build/config/win/BUILD.gn
+++ b/other/SSE2/build/config/win/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Chromium Authors and Alex313031. All rights reserved.
+# Copyright 2023 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.
@@ -43,9 +43,7 @@ declare_args() {
use_clang_diagnostics_format = false
# Indicates whether to use /pdbpagesize:8192 to allow PDBs larger than 4 GiB.
- # This requires updated debugging and profiling tools which are not widely
- # distributed yet which is why it is currently opt-in.
- use_large_pdbs = false
+ use_large_pdbs = true
}
# This is included by reference in the //build/config/compiler config that
@@ -184,7 +182,10 @@ config("compiler") {
if (use_large_pdbs) {
# This allows PDBs up to 8 GiB in size. This requires lld-link.exe or
# link.exe from VS 2022 or later.
- ldflags += [ "/pdbpagesize:8192" ]
+ if (!defined(configs)) {
+ configs = []
+ }
+ configs += [ ":pdb_larger_than_4gb" ]
}
if (!is_debug && !is_component_build) {
@@ -303,7 +304,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=NTDDI_WIN10_FE",
+ "NTDDI_VERSION=NTDDI_WIN10_NI",
# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
diff --git a/other/SSE3/build/config/win/BUILD.gn b/other/SSE3/build/config/win/BUILD.gn
index bac0ee95..300ced20 100644
--- a/other/SSE3/build/config/win/BUILD.gn
+++ b/other/SSE3/build/config/win/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Chromium Authors and Alex313031. All rights reserved.
+# Copyright 2023 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.
@@ -43,9 +43,7 @@ declare_args() {
use_clang_diagnostics_format = false
# Indicates whether to use /pdbpagesize:8192 to allow PDBs larger than 4 GiB.
- # This requires updated debugging and profiling tools which are not widely
- # distributed yet which is why it is currently opt-in.
- use_large_pdbs = false
+ use_large_pdbs = true
}
# This is included by reference in the //build/config/compiler config that
@@ -185,7 +183,10 @@ config("compiler") {
if (use_large_pdbs) {
# This allows PDBs up to 8 GiB in size. This requires lld-link.exe or
# link.exe from VS 2022 or later.
- ldflags += [ "/pdbpagesize:8192" ]
+ if (!defined(configs)) {
+ configs = []
+ }
+ configs += [ ":pdb_larger_than_4gb" ]
}
if (!is_debug && !is_component_build) {
@@ -304,7 +305,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=NTDDI_WIN10_FE",
+ "NTDDI_VERSION=NTDDI_WIN10_NI",
# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
diff --git a/src/build/config/win/BUILD.gn b/src/build/config/win/BUILD.gn
index 0c17243d..801fca0b 100644
--- a/src/build/config/win/BUILD.gn
+++ b/src/build/config/win/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Chromium Authors and Alex313031. All rights reserved.
+# Copyright 2023 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.
@@ -43,9 +43,7 @@ declare_args() {
use_clang_diagnostics_format = false
# Indicates whether to use /pdbpagesize:8192 to allow PDBs larger than 4 GiB.
- # This requires updated debugging and profiling tools which are not widely
- # distributed yet which is why it is currently opt-in.
- use_large_pdbs = false
+ use_large_pdbs = true
}
# This is included by reference in the //build/config/compiler config that
@@ -188,7 +186,10 @@ config("compiler") {
if (use_large_pdbs) {
# This allows PDBs up to 8 GiB in size. This requires lld-link.exe or
# link.exe from VS 2022 or later.
- ldflags += [ "/pdbpagesize:8192" ]
+ if (!defined(configs)) {
+ configs = []
+ }
+ configs += [ ":pdb_larger_than_4gb" ]
}
if (!is_debug && !is_component_build) {
@@ -307,7 +308,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=NTDDI_WIN10_FE",
+ "NTDDI_VERSION=NTDDI_WIN10_NI",
# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
diff --git a/src/chrome/app/app_management_strings.grdp b/src/chrome/app/app_management_strings.grdp
index 7d1b324b..085b9822 100644
--- a/src/chrome/app/app_management_strings.grdp
+++ b/src/chrome/app/app_management_strings.grdp
@@ -1,5 +1,5 @@
-
+
diff --git a/src/chrome/app/chromium_strings.grd b/src/chrome/app/chromium_strings.grd
index 624eab21..1c61c186 100644
--- a/src/chrome/app/chromium_strings.grd
+++ b/src/chrome/app/chromium_strings.grd
@@ -399,11 +399,11 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
Not used in Thorium. Placeholder to keep resource maps in sync.
-
- To get future Thorium updates, you'll need macOS 10.13 or later. This computer is using OS X 10.11.
+
+ To get future Thorium updates, you'll need macOS 10.15 or later. This computer is using macOS 10.13.
-
- To get future Thorium updates, you'll need macOS 10.13 or later. This computer is using macOS 10.12.
+
+ To get future Thorium updates, you'll need macOS 10.15 or later. This computer is using macOS 10.14.
@@ -1455,8 +1455,17 @@ Permissions you've already given to websites and apps may apply to this account.
-
- You can enjoy the most out of Thorium
+
+ Sign in to Thorium
+
+
+ Make Thorium your own
+
+
+ Do more with Thorium
diff --git a/src/chrome/app/generated_resources.grd b/src/chrome/app/generated_resources.grd
index 2e60b2f1..5a73d6ee 100644
--- a/src/chrome/app/generated_resources.grd
+++ b/src/chrome/app/generated_resources.grd
@@ -570,8 +570,8 @@ are declared in tools/grit/grit_rule.gni.
Inspect &background page
-
- Open in Reader
+
+ Open in reading mode
&Reload
@@ -773,7 +773,7 @@ are declared in tools/grit/grit_rule.gni.
Select &all
- &Translate to $1English
+ &Translate selection to $1English
&Search $1Google for “$2flowers”
@@ -787,6 +787,9 @@ are declared in tools/grit/grit_rule.gni.
Search inside image with $1Google
+
+ Translate text in image with $1Google
+
Search page with $1Google Lens
@@ -806,7 +809,7 @@ are declared in tools/grit/grit_rule.gni.
Open with $1Hangouts
- Provide Autofill feedback
+ Help improve autofill
@@ -834,8 +837,8 @@ are declared in tools/grit/grit_rule.gni.
Inspect &Background Page
-
- Open in Reader
+
+ Open in Reading Mode
&Reload
@@ -1062,6 +1065,9 @@ are declared in tools/grit/grit_rule.gni.
Search Inside Image with $1Google
+
+ Translate Text in Image with $1Google
+
Search Page with $1Google
@@ -1075,7 +1081,7 @@ are declared in tools/grit/grit_rule.gni.
Suggest Password...
- Provide Autofill Feedback
+ Help Improve Autofill
@@ -5089,6 +5095,9 @@ are declared in tools/grit/grit_rule.gni.
Manage shortcuts
+
+ The "$1Google Docs Offline" extension wants to access your account
+
@@ -5780,6 +5789,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
Requests access
+
+ Manage this extension
+
@@ -7245,6 +7257,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
Following
+
+ Resume your journey for $1Office Chairs
+
@@ -7299,10 +7314,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
- UNREAD
+ Unread
- PAGES YOU'VE READ
+ Pages you've read
Mark as read
@@ -7452,45 +7467,73 @@ Keep your key file in a safe place. You will need it to create new versions of y
$1www.google.com - $2Bookmarks Bar
-
-
-
-
- Read anything
+
+ Your administrator has disabled this feature.
-
+
+
+
+
+
+ Reading Mode
+
+
+
+
+ Reading mode
+
+
+
Text formatting
-
+
Font
-
+
Decrease font-size
-
+
Increase font-size
-
+
Theme
-
+
Line height
-
+
Letter spacing
-
- Tight
+
+ Standard
-
- Default
-
-
+
Loose
-
+
Very loose
+
+ Wide
+
+
+ Very wide
+
+
+ Default
+
+
+ Light
+
+
+ Dark
+
+
+ Yellow
+
+
+ Blue
+
@@ -7499,15 +7542,29 @@ Keep your key file in a safe place. You will need it to create new versions of y
Add note...
+
+ Order
+
Learn more
+
+ All Notes
+
+
+ {NUM_NOTES, plural, =1 {1 Note} other {# Notes}}
+
Feed
+
+
+ Google Lens
+
+
Click to go back, hold to see history
@@ -7641,9 +7698,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
Can't save card right now
+
+ Save IBAN
+
Save payment method
+
+ Show IBAN value
+
+
+ Hide IBAN value
+
Translate this page
@@ -7747,6 +7813,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
Saved Tab Groups
+
+ Menu containing hidden saved tab groups
+
+
+ Hidden saved tab groups
+
Menu containing hidden bookmarks
@@ -7974,8 +8046,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
- Nicely Done!
+ Nicely done!
+
+
Right-click on a tab and select "Add Tab To New Group"
@@ -8005,9 +8079,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
Click the group name to expand or collapse it
-
- Nicely Done!
-
Try using tab groups to organize tasks, for online shopping, and more
@@ -8029,6 +8100,29 @@ Keep your key file in a safe place. You will need it to create new versions of y
Try using the side panel for bookmarks, journeys, and more
+
+
+ Customize Thorium to give your browser a new look
+
+
+ Click “Customize Thorium”
+
+
+ Click “Change theme” to explore themes inspired by artists, nature and more
+
+
+ Select a collection
+
+
+ Choose an image to apply the theme instantly
+
+
+ Click the back arrow to explore other options
+
+
+ You can now give your browser a new look at any time.
+
+
@@ -8494,6 +8588,9 @@ Check your passwords anytime in $1Google
Selected file is too big (max size: 3mb).
+
+ Send <a href="#" id="autofill-metadata-url">autofill metadata</a>
+
<Four files generated by Intel Wi-Fi firmware: csr.lst, fh_regs.lst, radio_reg.lst, monitor.lst.sysmon. The first three are binary files containing register dumps, and are asserted by Intel to contain no personal or device-identifying information. The last file is an execution trace from the Intel firmware; it has been scrubbed of any personal or device-identifying information, but is too large to display here. These files were generated in response to recent Wi-Fi problems with your device, and will be shared with Intel to help troubleshoot these problems.>
@@ -9074,6 +9171,9 @@ Check your passwords anytime in $1Google
Close group
+
+ Delete group
+
Move group to new window
@@ -9097,6 +9197,9 @@ Check your passwords anytime in $1Google
Close Group
+
+ Delete Group
+
Move Group to New Window
@@ -9600,9 +9703,6 @@ Check your passwords anytime in $1Google
Share link to
-
- Share link to $1Facebook
-
Follow
@@ -10510,6 +10610,9 @@ Check your passwords anytime in $1Google
Sign in anyway
+
+ Continue
+
Cancel sign in
@@ -10573,7 +10676,7 @@ Check your passwords anytime in $1Google
Can't sign in to $1Jane.Doe@gmail.com
- Can't sync to $1Jane.Doe@gmail.com
+ Can't sync with $1Jane.Doe@gmail.com
Close
@@ -10940,9 +11043,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
Verify it's you
-
- Couldn't connect to the sync server. Retrying...
-
Sign in again to resume sync
@@ -13256,7 +13356,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Turn on Bluetooth?
- Bluetooth will be temporarily turned on to communicate with your security key
+ Bluetooth must be on to use your passkey on a different device. You can always manage this in settings.
Turn on
@@ -13317,8 +13417,11 @@ Please help our engineers fix this problem. Tell us what happened right before y
Security key request
-
- A different device
+
+ Use a phone or tablet
+
+
+ Use a different phone or tablet
@@ -14087,8 +14190,11 @@ Please help our engineers fix this problem. Tell us what happened right before y
Verifying…
-
- Signing in to $1rp.example with $2idp.example
+
+ Signing you in…
+
+
+ Automatically sign me in to this website
@@ -14313,6 +14419,17 @@ Please help our engineers fix this problem. Tell us what happened right before y
Webview
+
+
+ $1Work address form filled.
+
+
+ $1Visa 1111 filled.
+
+
+ Email filled.
+
+
diff --git a/src/chrome/app/settings_chromium_strings.grdp b/src/chrome/app/settings_chromium_strings.grdp
index 49f38d9e..11afb7df 100644
--- a/src/chrome/app/settings_chromium_strings.grdp
+++ b/src/chrome/app/settings_chromium_strings.grdp
@@ -121,12 +121,12 @@
-
+
- Sites will probably work as you expect but won't remember you after you close all Chromium windows
+ Sites will probably work as you expect but won't remember you after you close all Thorium windows
- Always clear site data from your device when you close Chromium
+ Always clear site data from your device when you close Thorium
@@ -261,8 +261,11 @@
Sign out of Thorium?
-
- Thorium will access your Drive to make suggestions in the address bar
+
+ When you type in the address bar or search box, Thorium sends what you type to your default search engine to get better suggestions. This is off in Incognito.
+
+
+ When you type in the address bar or search box, Thorium sends what you type to Google Drive to get item suggestions. This is off in Incognito.
Sign in to sync and personalize Thorium across your devices
@@ -270,10 +273,10 @@
- When on, Thorium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Thorium fast. Your inactive tabs automatically become active again when you go back to them. <a id="highEfficiencyLearnMore" target="_blank" href="$1" aria-label="$2">Learn more</a>
+ When on, Thorium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Thorium fast. Your inactive tabs automatically become active again when you go back to them.
- When on, Thorium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates. <a id="batterySaverLearnMore" target="_blank" href="$1" aria-label="$2">Learn more</a>
+ When on, Thorium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates.
diff --git a/src/chrome/app/settings_strings.grdp b/src/chrome/app/settings_strings.grdp
index b76b4e20..f8081bc4 100644
--- a/src/chrome/app/settings_strings.grdp
+++ b/src/chrome/app/settings_strings.grdp
@@ -17,6 +17,9 @@
Opens in new tab
+
+ Send feedback button
+
@@ -386,19 +389,13 @@
Remove
- Remove
-
-
- Are you sure you want to remove this address?
+ Delete
- Remove address
+ Delete address
- Address removed
-
-
- Remove
+ Address deleted
Clear copy
@@ -406,6 +403,12 @@
Edit card
+
+ Delete card
+
+
+ This payment method will be deleted from this device
+
To add or manage Google Pay payment methods, visit your <a href="$1" target="_blank">Google Account</a>
@@ -1277,6 +1280,18 @@
Canceled
+
+ Waiting for the next operation
+
+
+ "Authorize" instruction received
+
+
+ "Proof of Possession" instruction received
+
+
+ "Import Certificate" instruction received
+
Certificate Profile Name
@@ -1449,12 +1464,6 @@
Memory Saver
-
- Learn more about memory saver
-
-
- Send feedback about memory saver
-
Add to the "always keep these sites active" list
@@ -1479,12 +1488,6 @@
Energy saver options
-
- Learn more about energy saver
-
-
- Send feedback about energy saver
-
@@ -1711,6 +1714,32 @@
+
+
+ Spam and fraud reduction is on
+
+
+ Spam and fraud reduction is off
+
+
+ Sites you visit can validate that you're a real user and not a bot.
+
+
+ When on
+
+
+ Browsing is smoother, as you're more likely trusted from one site to the next.
+
+
+ This setting works without identifying you or allowing sites to see your browsing history.
+
+
+ Things to consider
+
+
+ A site you visit can save info with Thorium that validates that you're a real user. As you keep browsing, sites can check with Thorium and verify from the first site that you're likely a trusted user.
+
+
Privacy Sandbox
@@ -2487,6 +2516,11 @@
Upgrade navigations to HTTPS and warn you before loading sites that don't support it
+
+ Upgrade navigations to HTTPS and warn you before loading sites that don't support it.
+
+ You can't change this setting because you have Advanced Protection enabled.
+
Manage certificates
@@ -4721,4 +4755,7 @@
Control which phones you use as security keys
+
+ $1Google Docs Offline (ID: $2ghbmnnjooekpmoecnnnilnnbdlolhkhi)
+
diff --git a/src/chrome/app/shared_settings_strings.grdp b/src/chrome/app/shared_settings_strings.grdp
index 9c957956..8618eb7a 100644
--- a/src/chrome/app/shared_settings_strings.grdp
+++ b/src/chrome/app/shared_settings_strings.grdp
@@ -210,12 +210,6 @@
Enhanced spell check
-
- Autocomplete searches and URLs
-
-
- Sends some cookies and searches from the address bar and search box to your default search engine
-
Help improve Thorium's features and performance
@@ -237,8 +231,11 @@
Sends the web address of the page you're trying to reach to Google
-
- Google Drive search suggestions
+
+ Improve search suggestions
+
+
+ Show Google Drive suggestions
diff --git a/src/chrome/browser/ui/browser_ui_prefs.cc b/src/chrome/browser/ui/browser_ui_prefs.cc
index 6cf3b86a..1c7d1fa5 100644
--- a/src/chrome/browser/ui/browser_ui_prefs.cc
+++ b/src/chrome/browser/ui/browser_ui_prefs.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 The Chromium Authors. All rights reserved.
+// Copyright 2023 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.
@@ -29,7 +29,7 @@
namespace {
uint32_t GetHomeButtonAndHomePageIsNewTabPageFlags() {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
return PrefRegistry::NO_REGISTRATION_FLAGS;
#else
return user_prefs::PrefRegistrySyncable::SYNCABLE_PREF;
@@ -41,7 +41,7 @@ uint32_t GetHomeButtonAndHomePageIsNewTabPageFlags() {
void RegisterBrowserPrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true);
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
registry->RegisterIntegerPref(prefs::kRelaunchNotification, 0);
registry->RegisterIntegerPref(
prefs::kRelaunchNotificationPeriod,
@@ -49,12 +49,12 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry) {
UpgradeDetector::GetDefaultHighAnnoyanceThreshold()
.InMilliseconds()));
registry->RegisterDictionaryPref(prefs::kRelaunchWindow);
-#endif // !defined(OS_ANDROID)
+#endif // !BUILDFLAG(IS_ANDROID)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
registry->RegisterIntegerPref(
prefs::kMacRestoreLocationPermissionsExperimentCount, 0);
-#endif // defined(OS_MAC)
+#endif // BUILDFLAG(IS_MAC)
}
void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -65,7 +65,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
bool reset_check_default = false;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
reset_check_default = true;
#endif
registry->RegisterBooleanPref(prefs::kResetCheckDefaultBrowser,
@@ -85,7 +85,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kPrintPreviewUseSystemDefaultPrinter,
false);
#endif
@@ -95,6 +95,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
registry->RegisterBooleanPref(prefs::kWebRTCAllowLegacyTLSProtocols, false);
+ registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, true);
// Dictionaries to keep track of default tasks in the file browser.
registry->RegisterDictionaryPref(
@@ -106,7 +107,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
// We need to register the type of these preferences in order to query
// them even though they're only typically controlled via policy.
- registry->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true);
registry->RegisterBooleanPref(prefs::kHideWebStoreIcon, false);
registry->RegisterBooleanPref(prefs::kSharedClipboardEnabled, true);
@@ -114,7 +114,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kClickToCallEnabled, true);
#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
// This really belongs in platform code, but there's no good place to
// initialize it between the time when the AppController is created
// (where there's no profile) and the time the controller gets another
@@ -149,7 +149,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterListPref(prefs::kTabCaptureAllowedByOrigins);
registry->RegisterListPref(prefs::kSameOriginTabCaptureAllowedByOrigins);
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kCaretBrowsingEnabled, false);
registry->RegisterBooleanPref(prefs::kShowCaretBrowsingDialog, true);
#endif
@@ -162,4 +162,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kHttpsOnlyModeEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ registry->RegisterListPref(prefs::kHttpAllowlist);
+ registry->RegisterBooleanPref(prefs::kHttpsUpgradesEnabled, true);
}
diff --git a/src/chrome/installer/linux/common/apt.include b/src/chrome/installer/linux/common/apt.include
index c6de9846..04e606dd 100644
--- a/src/chrome/installer/linux/common/apt.include
+++ b/src/chrome/installer/linux/common/apt.include
@@ -183,7 +183,41 @@ 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
-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
+cIyj03nZ19c+b30+2FzG/uSnb/ePWsRLY7Iyz4ygr8etweBPnEIvjwpAZxOuuQIN
+BGPs+VgBEADKbgLL+vAabKV2rGSDgY+IttTAtg9w9Uor1+Q/CIWGxi/JQy7l7XTK
+jmS0wvdwU+9f/eGsjxigbvAcSsV1szyKfVQQFT2m9KhDrBqNCAvQ5Tg6ZQdNe51o
+HwjiIQ1i7z8QoT22VucdTYqcMLAHe+g0aNqLLSSWLAiW4z+nerclinjiTRCw/aWZ
+JR1ozQd2eKwAw6rk19bHcihXo2E0K1EDmdHcNA8ytypxwWWXBftCYRWXi5J02GeZ
+azxmx/DULnFgy2J4G0ULTqGWsbf/tCt22jqgyX+vFj/sJPn+l3IJqpyNY5yBG6Gc
+ejeP9vRoQrapGqHkcx+37f2vjwmpj5548JI52KEC1yZeFwp8HjGLp+zGajpnokrK
+d4XJHniW9+bPLq7Yp7PNn65MaYvZUjv5enKd45fFK6vJ3Ys/fx6PBXKKBs9flRIg
+dXOKSvtV+bGIG0I/p/JEZ/wPxRgxHPDK5jbcI6KBVm3Uk+CHFC4IBAtzdSh6H4Zf
+w1EH3dQZMLVBB/Sj34UQhlwAOlAXtZH3vks/KpclWK8gnqz3i8HN0ezvcnQlRiRO
+8IqlN9/PmFqZeNTerklT7Tt0jXqiopLHL0FXR2LsndeORfxDE1rhVOUxloeuIsY8
+x6gO8h2bGg41YapROjYxZZEcakg9Nch4XAlxeqB4ISttfbiVxeL2DQARAQABiQRE
+BBgBCAAPBQJj7PlYAhsCBQkFo5qAAikJEHch9jvTi0eWwV0gBBkBCAAGBQJj7PlY
+AAoJEOiJefubMKzyRuUP/jzITdamLoLDxEHOra7Mt2S6peHr3XMbpWEdRlA1vzl7
+AaMYO78Pbm7YkWuEByaXM6vGCC8vhrxZq09dBo+oNlpKHjV6UzVhrQLtw1CrvE1U
+DSlw3ltD4pddky5BoDz0EKVNJchPPqPg7im+EAbzLxDYT0y/tRhqzQ6EODNUivLa
+zWjY+aXWqOVv2Ny071ytFSIXq/1G71pCSAYdi3i7I/cfMoN+g27Nf9Zfc7QWbw02
+mcmTqpmwsrCDu6RR0k4gQhsss0tT1libKzfA20Mox+bhPv1ptI3A0ifh13mFqkf0
+EC4MmeThacU5qn0BBk+AlfZZcoLYNdBl5JfVVekjeuvsVJtJ5zx3luK3DuzbRdbJ
+AHb5mh61HE2BHXTgYiH8tqO1q0soVz02c/1KaF7LyevFVkXHoe5eycY4+RuOyIVg
+yzG09Vic7vacENMM/hl6Ms5prLYq0JvykmQIfxTSC6q4MZV35LTZfH3jt6/K8eoa
+3lXTJUU8Pu4C7sDlAFhe+1y3Or3dLWNkMigw/3c57xWlStcEF+LPMdXE/pVSbEz3
+sgT6CNVGo30+4yunYP3IQFQaTjh9BbnPK66iZhpzsynHZ+daAYD8CX26Da69Ligj
+NTIsQnGlzozxFiW5pxIiMWAKKC5xGy9MHLqWhsbUUy+dDLN7r58B4ptusrzk64DU
+pbcQAJ+wzIvCe2qf5C7yveT/ohGfSL1dX9uFK0TbLqIdSaqzmx3t1+SZUjtuymg6
+4MoUgSt1N6mEfT0TSG9AMkRGcyb6uHxOVm05L/BjLDH7ZqFKHkm3d0jkvjyjNH5Y
+lsTGJerxmpOemf8RAZDwygz5LZ1L5zNfzlkv6beKD60ofBppd28ZxgjeHxbBCdfc
+gFQUK6vxZJ19ygbKJDhylNdwjXUaAaCTKnEzzDHGgtUJO22kIFEKk9/z88sowIrT
++Te7hBKG2nVYMNBWEWb8Tqh8b1NIYgpwmawcdBjuu6QSnqVIi+YvRmMHJFqHicrn
+OhzaPz2w2nK56ZnCv1f5X0s6MXu9BM7/zLdwEE0K3RHmWvF4G9HN7XmTQPNKG4fI
++GDY8Gp885LtGdSIXYV4j7NDvEWcuqgPpyQjvpFEB/vDSyqe8yUNGmNVT5wPK6lH
+k10Hv2g9cmkeW0qDiRpDg7nHoFcdUSkAyElzxs++Z8CJMVpzl/TJyJt/ZHm02XNs
+owP8HFWvNcyCGwnk9aYCJRuo+/UgjmQvDnVvoHO+XwrMkjSH7JKJQZvzrJ5x8cZs
+XvM9FyHYq3n7u3R+ASMBVwxF9yAex9CfwRg/3OhzOnkbDsu9HwEEOrV2xMQQQ9MO
+t74fIbGkM3hzws0asNoIV1ec52U1X/NP1W8GT9GRX5OX8uTi
KEYDATA
}
diff --git a/src/chrome/installer/mini_installer/chrome.release b/src/chrome/installer/mini_installer/chrome.release
index c287a901..8583988c 100644
--- a/src/chrome/installer/mini_installer/chrome.release
+++ b/src/chrome/installer/mini_installer/chrome.release
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 The Chromium Authors and Alex313031 and gz83. All rights reserved.
+# Copyright 2023 The Chromium Authors and Alex313031 and gz83
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -126,6 +126,8 @@ WidevineCdm\_platform_specific\win_x86\widevinecdm.dll: %(VersionDir)s\WidevineC
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
diff --git a/src/components/download/public/common/download_features.cc b/src/components/download/public/common/download_features.cc
index 5d19b0f6..a0a5285b 100644
--- a/src/components/download/public/common/download_features.cc
+++ b/src/components/download/public/common/download_features.cc
@@ -1,4 +1,4 @@
-// Copyright 2022 The Chromium Authors and Alex313031.
+// Copyright 2023 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.
@@ -13,15 +13,6 @@ BASE_FEATURE(kUseDownloadOfflineContentProvider,
"UseDownloadOfflineContentProvider",
base::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kDownloadAutoResumptionNative,
- "DownloadsAutoResumptionNative",
-#if BUILDFLAG(IS_ANDROID)
- base::FEATURE_ENABLED_BY_DEFAULT
-#else
- base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-);
-
BASE_FEATURE(kParallelDownloading,
"ParallelDownloading",
#if BUILDFLAG(IS_ANDROID)
diff --git a/src/components/privacy_sandbox/privacy_sandbox_prefs.cc b/src/components/privacy_sandbox/privacy_sandbox_prefs.cc
index bf6fb344..fed98d24 100644
--- a/src/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/src/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -92,6 +92,9 @@ extern const char kPrivacySandboxTopicsConsentLastUpdateReason[] =
extern const char kPrivacySandboxTopicsConsentTextAtLastUpdate[] =
"privacy_sandbox.topics_consent.text_at_last_update";
+extern const char kPrivacySandboxAntiAbuseInitialized[] =
+ "privacy_sandbox.anti_abuse_initialized";
+
} // namespace prefs
namespace privacy_sandbox {
@@ -153,6 +156,8 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
static_cast(TopicsConsentUpdateSource::kDefaultValue));
registry->RegisterStringPref(
prefs::kPrivacySandboxTopicsConsentTextAtLastUpdate, "");
+ registry->RegisterBooleanPref(prefs::kPrivacySandboxAntiAbuseInitialized,
+ false);
}
} // namespace privacy_sandbox
diff --git a/src/components/search_engines/prepopulated_engines.json b/src/components/search_engines/prepopulated_engines.json
index c84d451b..76f60004 100644
--- a/src/components/search_engines/prepopulated_engines.json
+++ b/src/components/search_engines/prepopulated_engines.json
@@ -28,7 +28,7 @@
// Increment this if you change the data in ways that mean users with
// existing data should get a new version. Otherwise, existing data may
// continue to be used and updates made here will not always appear.
- "kCurrentDataVersion": 137
+ "kCurrentDataVersion": 139
},
// The following engines are included in country lists and are added to the
@@ -130,11 +130,13 @@
"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",
+ "image_translate_url": "{google:baseSearchByImageURL}upload?filtertype=tr&{imageTranslateSourceLocale}{imageTranslateTargetLocale}",
"contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",
"image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
"side_search_param": "sidesearch",
+ "image_translate_source_language_param_key": "sourcelang",
+ "image_translate_target_language_param_key": "targetlang",
"side_image_search_param": "sideimagesearch",
- "image_search_branding_label": "Google Lens",
"search_intent_params": ["si", "gs_ssp"],
"alternate_urls": [
"{google:baseURL}#q={searchTerms}",