Skip to content

Commit

Permalink
Upgrade from Chromium 132.0.6834.15 to Chromium 132.0.6834.33
Browse files Browse the repository at this point in the history
Update pins list timestamp

Updated strings for Chromium 132.0.6834.33
  • Loading branch information
brave-builds authored and emerick committed Dec 5, 2024
1 parent 842224c commit e8d7838
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions app/os_settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@
Face control
</message>
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_DESCRIPTION" desc="The description for the checkbox that enables controlling the mouse cursor and keyboard with face movements.">
Use head movements and facial expressions to control your Chromebook
Use head movements and facial expressions to control your Chromebook. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_PREVIOUS" desc="Label for previous button.">
Previous
Expand Down Expand Up @@ -1550,8 +1550,8 @@
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_ACTIONS_ENABLED_LABEL" desc="Label description for a toggle button that enables or disables using facial gestures to trigger actions.">
Use facial gestures to perform actions
</message>
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_CURSOR_CONTROL_ENABLED_LABEL" desc="Label description for a toggle button that enables or disables using head movement to control the mouse cursor." translateable="false">
Use head movements to control mouse cursor
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_CURSOR_CONTROL_ENABLED_LABEL" desc="Label description for a toggle button that enables or disables using head movement to control the mouse cursor.">
Use head movements to control the mouse cursor
</message>
<message name="IDS_OS_SETTINGS_ACCESSIBILITY_FACEGAZE_ADJUST_SEPARATELY_LABEL" desc="Label for a toggle button that allows the user to adjust the cursor speed separately for up/down/left/right speeds in FaceGaze.">
Adjust speed separately for each direction
Expand Down
4 changes: 2 additions & 2 deletions browser/ui/android/strings/android_chrome_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -6211,8 +6211,8 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Brave da
<message name="IDS_CUSTOM_TABS_SIGNED_OUT_MESSAGE_SUBTITLE" desc="This string is the body of a message promotion about signing in to Brave with the user's Brave sync chain. It explains the overarching user benefit of signing in (access to passwords, etc.). We want users to understand why signing in is beneficial, and click 'Sign in' to sign in to their Brave sync chain. The tone should be informative and lightweight.">
Sign in to get your passwords and more on all your devices
</message>
<message name="IDS_CUSTOM_TABS_SIGNED_OUT_MESSAGE_TITLE" desc="This string is the title of a message promotion about signing in to Brave with the user's Brave sync chain. It indicates that the current Activity may use Brave data (the rest of the app may not be).">
Running in Brave
<message name="IDS_CUSTOM_TABS_SIGNED_OUT_MESSAGE_TITLE" desc="This string is the title of a message promotion about signing in to Brave with the user's Brave sync chain.">
Sign in to Brave
</message>

<message name="IDS_ACCOUNT_SELECTION_CONTINUE" desc="Title of the button that continues filling with the only available set of credentials.">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Tue Dec 3 19:46:08 UTC 2024
# Last updated: Thu Dec 5 14:43:43 UTC 2024
PinsListTimestamp
1733255168
1733409823
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "132.0.6834.15",
"tag": "132.0.6834.33",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 3914cb63eed91e0e8a6eb8b64092c5dbe5348781..a890eb921ffd50ce71c0e2f8974fb9b6fb3a2946 100644
index c2c22a92bccb2487319affed384cac10dbc839a8..b46d77cd7226986a8f31a70b295d8c53f271f9e3 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2506,6 +2506,7 @@ static_library("browser") {
Expand All @@ -10,7 +10,7 @@ index 3914cb63eed91e0e8a6eb8b64092c5dbe5348781..a890eb921ffd50ce71c0e2f8974fb9b6

if (is_android) {
sources += [
@@ -8629,6 +8630,7 @@ static_library("browser_public_dependencies") {
@@ -8628,6 +8629,7 @@ static_library("browser_public_dependencies") {
"//rlz:rlz_lib",
]
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f459dd31bdd177277632c8b78e074c3613f9d835..8b2cee2c77cc2f9c5ab2852b47a2fb6b357a3b23 100644
index 41583cc15dddd096ace0e5aa72d1e1828ce2cdf2..ca4d1fd0af53942ae115351ba3a2e545d7db8ace 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4331,6 +4331,7 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
@@ -4333,6 +4333,7 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
index 6447bd038f86a7b52f50f20c161db51879aea2f2..36f03a541c2cb2e21a75b83542794d25a7668ada 100644
index b682eae28e7944e59d2e7ec9f9e490ac4bafa3dc..e824dd6f5ada080d893302b5b859f5cb72135bad 100644
--- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
+++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
@@ -167,6 +167,7 @@ void GetGuestViewDefaultContentSettingRules(
@@ -204,6 +204,7 @@ void GetGuestViewDefaultContentSettingRules(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK),
content_settings::ProviderType::kNone, incognito));
Expand Down
6 changes: 3 additions & 3 deletions patches/chrome-browser-prefs-browser_prefs.cc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a6002045888c401a3d1967d34ca2def6bb6f1abb..2c78b3edd779772e6f88d09d5991abf50f0e8e7e 100644
index 7d352058fb59f8ab77c8a35a8b16f15a2f3d216d..91990f59deec51633f2917a2e4e308cb611dc683 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1895,6 +1895,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1903,6 +1903,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kQRCodeGeneratorEnabled, true);

// This is intentionally last.
+ brave::RegisterLocalStatePrefs(registry);
RegisterLocalStatePrefsForMigration(registry);
}

@@ -2334,6 +2335,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2344,6 +2345,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterDictionaryPref(prefs::kReportingEndpoints);

registry->RegisterBooleanPref(prefs::kCompactModeEnabled, false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 33326eeb8c3c9f1a01b76fd7061ff18bb9618aa6..e7ea2647647290684592f0e67c8143ebc3fdb265 100644
index 3a324e6d466c3192a7ca4cd6a468a39537410d7f..e5a87434e577f39cd559ecbc9e517f70f58fe207 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -437,6 +437,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -445,6 +445,7 @@ public class ToolbarPhone extends ToolbarLayout
if (mOptionalButtonCoordinator != null) {
mOptionalButtonCoordinator.setBackgroundColorFilter(color);
}
+ BraveToolbarLayout.class.cast(this).updateModernLocationBarColorImpl(color);
}

private void updateModernLocationBarCorners() {
@@ -591,6 +592,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -599,6 +600,7 @@ public class ToolbarPhone extends ToolbarLayout
mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
+ BraveToolbarLayout.class.cast(this).onClickImpl(v);
}

@Override
@@ -1049,6 +1051,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -1078,6 +1080,7 @@ public class ToolbarPhone extends ToolbarLayout
* Tab Page.
*/
private void updateLocationBarLayoutForExpansionAnimation() {
+ if (!BraveToolbarLayout.class.cast(this).isLocationBarValid(mLocationBar)) return;
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
if (isInTabSwitcherMode()) return;

@@ -1428,6 +1431,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -1457,6 +1460,7 @@ public class ToolbarPhone extends ToolbarLayout
canvas.restore();
}

+ BraveToolbarLayout.class.cast(this).drawAnimationOverlay(mToolbarButtonsContainer, canvas);
// Draw the tab stack button and associated text if necessary.
if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) {
// Draw the tab stack button image.
@@ -2108,6 +2112,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -2141,6 +2145,7 @@ public class ToolbarPhone extends ToolbarLayout
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
index 06867da927e95897fd080d6b6a595632d117d793..a821d37246a003cce2470b10aebc8153acbb424d 100644
index 4ab54d8bef9ec22fcaa0e5fb5723112d5ecfedb9..bab6ee3a2b2f03254ad6a9aaa2f1e683808db1e8 100644
--- a/components/permissions/permission_uma_util.cc
+++ b/components/permissions/permission_uma_util.cc
@@ -152,6 +152,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
Expand Down
2 changes: 1 addition & 1 deletion patches/ios-chrome-browser-flags-about_flags.mm.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
index c9af85ed0c30802206781ae22a0cc6e1644910a5..d4c996da5c84b3cac8fecefacddc897ff27a54ed 100644
index b8623bea50b3e41ea666733343669f2ff4e61ad5..bb6aef315a2ca97a6bb329f6c3724f726ce6f802 100644
--- a/ios/chrome/browser/flags/about_flags.mm
+++ b/ios/chrome/browser/flags/about_flags.mm
@@ -1232,6 +1232,7 @@ const FeatureEntry::FeatureVariation kNewFeedPositioningVariations[] = {
Expand Down
4 changes: 2 additions & 2 deletions patches/net-dns-host_cache.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc
index c084fbf7f7a5104eb4e38e868d042dd5bbe360e0..836d95c7110b984d13a9035a25ce14b2e75baa1a 100644
index 28c298cc727801a760a46b210674344d40b91f32..cd163f0c67add9014e3e03b6bdc4279f1d1a34b4 100644
--- a/net/dns/host_cache.cc
+++ b/net/dns/host_cache.cc
@@ -518,6 +518,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
@@ -503,6 +503,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
hostname = HostPortPair(hostname.host(), port);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 8a8d18a9522d7b038f893f66480823ad4dc93c0d..b92e6b0777a5b860838b668fe2117c90c1b90bb8 100644
index 97628214830f09d4f74e77ffe1877125aceaf637..49a9b96e84579857a42db84ea2a3daaf64018c6c 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1965,6 +1965,7 @@
Expand All @@ -18,15 +18,15 @@ index 8a8d18a9522d7b038f893f66480823ad4dc93c0d..b92e6b0777a5b860838b668fe2117c90
},
{
name: "FileSystemAccessLockingScheme",
@@ -2784,6 +2786,7 @@
@@ -2788,6 +2790,7 @@
{
name: "MiddleClickAutoscroll",
status: "test",
+ base_feature: "none",
},
// Killswitch. Remove after 1 or 2 stable releases.
{
@@ -3872,6 +3875,7 @@
@@ -3876,6 +3879,7 @@
{
name: "Serial",
status: {"Android": "", "default": "stable"},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2.ts b/ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2.ts
index 46ad5894ec0d3556c8b03f80276628d3da1b32af..32782bd06dfe5890fde514446bd57ddca49e6256 100644
index 7680feb8de110ecc22450fa0a5d6e329c8d3186c..822f0b3353336af2166c8b9e3b18cbfc2230e8b2 100644
--- a/ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2.ts
+++ b/ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2.ts
@@ -8,6 +8,7 @@
Expand Down

0 comments on commit e8d7838

Please sign in to comment.