Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 134.0.6998.45 to Chromium 135.0.7049.17.

Browse Source
This commit is contained in:
Claudio DeSouza
2025-03-18 20:01:58 -04:00
committed by Max Karolinskiy
parent c3490bc980
commit 7a96b2b2de
38 changed files with 161 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
index 517017eb89801f7c17e4fc53fdb7b9b97654c6e3..b59b984d7a677233a45dca3c7db5f8d65ff74f7b 100644
index 9f991b6b098fc04faf1c1af561c418e8fda5b39a..824ec7987acb8011b10c06be4b803dad544512fb 100644
--- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml
+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
@@ -139,7 +139,7 @@ found in the LICENSE file.
android:gravity="center_vertical"
android:orientation="horizontal" />
@@ -147,7 +147,7 @@ found in the LICENSE file.
style="@style/ToolbarHoverableButton" />
</LinearLayout>
-
+ <include layout="@layout/brave_custom_tabs_toolbar" android:layout_height="wrap_content" android:layout_width="match_parent" />
patches/chrome-android-java-src-org-chromium-chrome-browser-SwipeRefreshHandler.java.patch
+6 -6
View File
@@ -1,13 +1,13 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
index 04b773ec01e971282222c98c45f82f1a42f2a001..9f453746a337e46f4f589326b9455185a1ddfb1b 100644
index 7cc13873ebd20d1ed7b7346358ac35f4487993ba..be4f000d6480581396ee6f80465b452b96a0a951 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
@@ -140,7 +140,7 @@ public class SwipeRefreshHandler extends TabWebContentsUserData
*
@@ -170,7 +170,7 @@ public class SwipeRefreshHandler extends TabWebContentsUserData
* @param tab The Tab where the swipe occurs.
* @param swipeRefreshLayoutCreator Creates {@link SwipeRefreshLayout}.
*/
- private SwipeRefreshHandler(Tab tab) {
+ public SwipeRefreshHandler(Tab tab) {
- private SwipeRefreshHandler(
+ public SwipeRefreshHandler(
Tab tab, @NonNull SwipeRefreshLayoutCreator swipeRefreshLayoutCreator) {
super(tab);
mTab = tab;
mTabObserver =
patches/chrome-browser-download-download_target_determiner.cc.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 8ac82dc70ee78a7db876ba195efd62532cc81b8a..66d5eaf018dbe02ae7bb2246b6ad4141f4d80895 100644
index 440666d4c72c3bf6c80c0ccfb291379e911e4e8e..9cf8bdf551ba55ff8e46264f3ab7e0f39305f4e2 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1316,6 +1316,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
@@ -1325,6 +1325,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP;
if (HasPromptedForPath() ||
confirmation_reason_ != DownloadConfirmationReason::NONE ||
@@ -10,11 +10,11 @@ index 8ac82dc70ee78a7db876ba195efd62532cc81b8a..66d5eaf018dbe02ae7bb2246b6ad4141
user_approved_path) {
// If the "DownloadRestrictions" enterprise policy explicitly disallows the
// download, don't let the user gesture bypass the dangerous verdict.
@@ -1351,6 +1352,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
@@ -1365,6 +1366,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
(download_->HasUserGesture() && visits == VISITED_REFERRER)))
return DownloadFileType::NOT_DANGEROUS;
+ BRAVE_DOWNLOAD_TARGET_DETERMINER_GET_DANGER_LEVEL2
return danger_level;
}
#else
return DownloadFileType::NOT_DANGEROUS;
patches/chrome-browser-extensions-BUILD.gn.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index d629eae2162b78f22aaa53795efe0d6d54d3d40d..dd63b3ab6627d7ab6b449e783e81c562b35f9270 100644
index 211fb3399e4a46f629a9dede33e495cc16051b78..6d5c08167a8936e80ab4da1581a5728aa20d646e 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1438,6 +1438,7 @@ source_set("extensions") {
@@ -1460,6 +1460,7 @@ source_set("extensions") {
allow_circular_includes_from += [ "//chrome/browser/glic:impl" ]
}
} # if (enable_extensions)
+ deps += brave_extensions_resources
}
if (enable_extensions) {
if (enable_extensions_core) {
patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch
+4 -4
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
index 20e7578e086aabd7c389191e69438f03b7ae3222..a99acbd109733032c0ff12f19481e9051ea01713 100644
index e330cb71631eb2b0b816d1fd87f98c49556ba047..f4454124c38c720858e34b4c7e7063e2dee41248 100644
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -706,6 +706,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
@@ -725,6 +725,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension);
info->incognito_access.is_active =
util::IsIncognitoEnabled(extension.id(), browser_context_);
+ BRAVE_CREATE_EXTENSION_INFO_HELPER
// Install warnings, but only if unpacked, the error console isn't enabled
// (otherwise it shows these), and we're in developer mode (normal users don't
// User Scripts toggle.
info.user_scripts_access.is_enabled = CanRunOrRequestUserScripts(extension);
patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch
+5 -5
View File
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
index 83b90ffb80436dc0cd08ca27023c131067fc61de..701a5fab72376cef955ddb693d4ebed14f1088d7 100644
index 13b0f7f7a6a2bc2c3d0d22d9fbfa7894de2a7824..28a66ca131da691f33e88d00afc469aa54db4b17 100644
--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
@@ -189,6 +189,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
@@ -190,6 +190,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
// From here on out, results must be returned asynchronously.
StartAsyncRun();
+ BRAVE_RUN
// TODO(crbug.com/40614113): collapse the asynchronicity
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
@@ -343,12 +344,14 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
base::OnceCallback next_step =
base::BindOnce(&IdentityGetAuthTokenFunction::GetAuthTokenForAccount,
@@ -363,12 +364,14 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
void IdentityGetAuthTokenFunction::StartMintTokenFlow(
IdentityMintRequestQueue::MintType type) {
#if !BUILDFLAG(IS_CHROMEOS)
patches/chrome-browser-metrics-chrome_feature_list_creator.cc.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc
index 73c9ee5a0d93a3937a95c3fb0da6992ef0cea567..573f96a383a8fafa52a5ef449172ea56b562070b 100644
index 3a2f310be667f24d8ec6e3e7b4d352954cb24c74..ee0fcc93477172927bd64bdaaac3817c7c2ec27b 100644
--- a/chrome/browser/metrics/chrome_feature_list_creator.cc
+++ b/chrome/browser/metrics/chrome_feature_list_creator.cc
@@ -351,5 +351,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() {
@@ -337,5 +337,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() {
local_state_->SetInt64(variations::prefs::kVariationsSeedDate,
base::Time::Now().ToInternalValue());
}
+ BRAVE_CHROME_FEATURE_LIST_CREATOR_SETUP_INITIAL_PREFS
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
}
patches/chrome-browser-notifications-notification_platform_bridge_android.cc.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/chrome/browser/notifications/notification_platform_bridge_android.cc b/chrome/browser/notifications/notification_platform_bridge_android.cc
index e4fefe63165d2ed6c1230460563312dd1cbbe261..ac737f9ee53f26ff560acc5d836bfb5c6b979e4d 100644
--- a/chrome/browser/notifications/notification_platform_bridge_android.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -347,7 +347,9 @@ void NotificationPlatformBridgeAndroid::Display(
: (persistent_notification_metadata
? persistent_notification_metadata->is_suspicious
: false),
- persistent_notification_metadata->skip_ua_buttons);
+ persistent_notification_metadata
+ ? persistent_notification_metadata->skip_ua_buttons
+ : false);
regenerated_notification_infos_[notification.id()] =
RegeneratedNotificationInfo(scope_url, std::nullopt);
patches/chrome-browser-resources-bookmarks-api_listener.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts
index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0cf321d31c 100644
index 300d498a445814bb13fb89c436d5634255e755af..abdbd6b74374ec0de403118855c1780095fd4c36 100644
--- a/chrome/browser/resources/bookmarks/api_listener.ts
+++ b/chrome/browser/resources/bookmarks/api_listener.ts
@@ -118,6 +118,7 @@ function onChildrenReordered(
@@ -11,7 +11,7 @@ index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0c
}
@@ -126,6 +127,7 @@ function onImportEnded() {
dispatch(refreshNodes(normalizeNodes(results[0]!)));
dispatch(refreshNodes(normalizeNodes(results[0])));
});
chrome.bookmarks.onCreated.addListener(onBookmarkCreated);
+ chrome.bookmarks.onMoved.addListener(onBookmarkMoved);
patches/chrome-browser-resources-bookmarks-reducers.ts.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts
index a39cfe3662872d5a0bec5e6cfec12cec77b90f53..34b52727ca37c045dcfbc2cffd5a54b7963ef9a3 100644
index b0baa90e1de3b65b6e669711a2f5afd6d68df6e9..c8a8adbf94c837be85d7184eb7e8e9a993a9b010 100644
--- a/chrome/browser/resources/bookmarks/reducers.ts
+++ b/chrome/browser/resources/bookmarks/reducers.ts
@@ -193,6 +193,9 @@ function editBookmark(nodes: NodeMap, action: EditBookmarkAction): NodeMap {
@@ -13,11 +13,11 @@ index a39cfe3662872d5a0bec5e6cfec12cec77b90f53..34b52727ca37c045dcfbc2cffd5a54b7
// Change node's parent.
nodeModifications[id] =
@@ -330,7 +333,7 @@ export function updateFolderOpenState(
folderOpenState, nodes[(action as SelectFolderAction).id]!.parentId!,
folderOpenState, nodes[(action as SelectFolderAction).id].parentId!,
nodes);
case 'move-bookmark':
- if (!nodes[(action as MoveBookmarkAction).id]!.children) {
+ if (!nodes[(action as MoveBookmarkAction).id] || !nodes[(action as MoveBookmarkAction).id]!.children) {
- if (!nodes[(action as MoveBookmarkAction).id].children) {
+ if (!nodes[(action as MoveBookmarkAction).id] || !nodes[(action as MoveBookmarkAction).id].children) {
return folderOpenState;
}
return openFolderAndAncestors(
patches/chrome-browser-resources-history-shared_style.css.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/history/shared_style.css b/chrome/browser/resources/history/shared_style.css
index 5db7e1351e8e9f28e85bd26d26683718db58eeeb..ee1bd0150987feac40f2dc75804654b9d1381b2d 100644
index 5f4da855dfba237f0771453f033c98cf4c793ad2..e0a446e79b4c37a5560a21a5e42a5b1fd5bbb79a 100644
--- a/chrome/browser/resources/history/shared_style.css
+++ b/chrome/browser/resources/history/shared_style.css
@@ -7,7 +7,7 @@
@@ -10,4 +10,4 @@ index 5db7e1351e8e9f28e85bd26d26683718db58eeeb..ee1bd0150987feac40f2dc75804654b9
+ * #include=cr-hidden-style br-shared-style
* #css_wrapper_metadata_end */
a {
/* Purposefully empty since this style is generated at build time from the
patches/chrome-browser-resources-history-synced_device_manager.html.patch
+14 -14
View File
@@ -1,20 +1,20 @@
diff --git a/chrome/browser/resources/history/synced_device_manager.html b/chrome/browser/resources/history/synced_device_manager.html
index 29bfb59551de19095847bc97e5d290fb0d178c85..6b734a18a7c29b6396b60f7f5e860f5ba82d3361 100644
index 054c5a8fea1014a1e5ad65ebefa04588f7fd2e27..b37a20308354db209974a4dcbad3842f62087e19 100644
--- a/chrome/browser/resources/history/synced_device_manager.html
+++ b/chrome/browser/resources/history/synced_device_manager.html
@@ -73,6 +73,7 @@
guestSession_)]]">
[[noSyncedTabsMessage(fetchingSyncedTabs_, searchTerm)]]
</div>
@@ -18,6 +18,7 @@
?hidden="${!this.showNoSyncedMessage_()}">
${this.noSyncedTabsMessage_()}
</div>
+<!--
<div id="sign-in-guide"
hidden="[[!showSignInGuide(signInState, guestSession_,
signInAllowed_)]]">
@@ -84,6 +85,7 @@
$i18n{turnOnSyncButton}
</cr-button>
</div>
<div id="sign-in-guide" ?hidden="${!this.showSignInGuide_()}">
<div id="illustration"></div>
<div id="turn-on-sync-promo">$i18n{turnOnSyncPromo}</div>
@@ -27,6 +28,7 @@
$i18n{turnOnSyncButton}
</cr-button>
</div>
+-->
<cr-lazy-render id="menu">
<template>
<cr-lazy-render-lit id="menu" .template='${() => html`
<cr-action-menu role-description="$i18n{menu}">
patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
index 75d4f871e93ec74f15c0bef198c8b37c69a99c1c..f34903de1c5137e50085fad4d8926b096e077764 100644
index 193a542384e0b4e0f19f35cf244753b6a6f88dbb..299d27a8c4125628e2ac3b0841a1ba69d851f95c 100644
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -191,6 +191,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
@@ -186,6 +186,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
Profile* profile) {
DCHECK(ShouldBuildServiceForProfile(profile));
+BRAVE_COMPUTE_ACCOUNT_CONSISTENCY_METHOD
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
if (!ash::IsAccountManagerAvailable(profile))
return AccountConsistencyMethod::kDisabled;
patches/chrome-browser-ui-BUILD.gn.patch
+7 -7
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index a66522f120f6f7577ce637db3e87b1bbcefaf306..f91f8524cfc904bcb3ffeb505c2b5fae670b0301 100644
index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d25d11f737 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -747,6 +747,7 @@ static_library("ui") {
@@ -749,6 +749,7 @@ static_library("ui") {
"//chrome/browser/task_manager:impl",
]
@@ -10,7 +10,7 @@ index a66522f120f6f7577ce637db3e87b1bbcefaf306..f91f8524cfc904bcb3ffeb505c2b5fae
if (enable_vr && is_win) {
deps += [ "//chrome/browser/vr:vr_base" ]
@@ -3531,7 +3532,10 @@ static_library("ui") {
@@ -3521,7 +3522,10 @@ static_library("ui") {
]
deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ]
} else {
@@ -22,10 +22,10 @@ index a66522f120f6f7577ce637db3e87b1bbcefaf306..f91f8524cfc904bcb3ffeb505c2b5fae
}
}
@@ -5689,6 +5693,7 @@ static_library("ui_public_dependencies") {
"//mojo/public/cpp/bindings",
"//ui/webui/resources",
]
@@ -5691,6 +5695,7 @@ static_library("ui_public_dependencies") {
if (enable_extensions_core) {
public_deps += [ "//extensions/browser" ]
}
+ public_deps += [ "//brave/browser/ui:ui_public_dependencies" ]
if (!is_android) {
public_deps += [
patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
index 116e80a289faf75f95c89a0e834c619dda04f63a..b8e0b4ac415f325956e8ce0b06fdbef342c58fe0 100644
index 43a55291eba0e7c2fb88ac55743302e2eacdc1b7..d8a9e02a0ac2bf8db2ea6e052c8762c599dd02ad 100644
--- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
+++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
@@ -22,6 +22,7 @@ found in the LICENSE file.
android:visibility="invisible"
android:contentDescription="@string/accessibility_toolbar_btn_delete_url" />
@@ -23,6 +23,7 @@ found in the LICENSE file.
android:contentDescription="@string/accessibility_toolbar_btn_delete_url"
android:tooltipText="@string/accessibility_toolbar_btn_delete_url" />
+<org.chromium.ui.widget.ChromeImageButton android:id="@+id/qr_button" style="@style/LocationBarActionButton" android:src="@drawable/ic_qr_code_18" android:visibility="invisible" android:contentDescription="@string/scan_qr_code" />
<org.chromium.ui.widget.ChromeImageButton
patches/chrome-browser-ui-views-toolbar-app_menu.h.patch
+4 -4
View File
@@ -1,13 +1,13 @@
diff --git a/chrome/browser/ui/views/toolbar/app_menu.h b/chrome/browser/ui/views/toolbar/app_menu.h
index def1151fc7ee00303f5a8c8531f85a07d9449d05..f3abd671ec02620fb36cd62b9e4835d14535620b 100644
index 48ed2bc5fac56de8fa4b4ae3f8e15849d38a891f..86ac2fd11014dfae446ed671d7251466679f2e8e 100644
--- a/chrome/browser/ui/views/toolbar/app_menu.h
+++ b/chrome/browser/ui/views/toolbar/app_menu.h
@@ -32,7 +32,7 @@ class MenuRunner;
} // namespace views
@@ -34,7 +34,7 @@ class MenuRunner;
struct BookmarkParentFolder;
// AppMenu adapts the AppMenuModel to view's menu related classes.
-class AppMenu final : public views::MenuDelegate,
+class AppMenu : public views::MenuDelegate,
public bookmarks::BaseBookmarkModelObserver,
public BookmarkMergedSurfaceServiceObserver,
public GlobalErrorObserver {
public:
patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
+3 -3
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
index f3387c7df303d4ac853bbaa3b42d0788876b9e5e..12b812c21522efcd4cd3cc4aa67951be24d63304 100644
index af4d850908f905d3db8b2c58df16bdfbdf3e5017..6a9804e2f0db1c7da8178a3786cf7a4308f84443 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -486,6 +486,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
@@ -502,6 +502,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)));
#endif
#endif // BUILDFLAG(IS_CHROMEOS)
+ BRAVE_CREATE_EXTENSIONS_SOURCE
return source;
patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+7 -7
View File
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
index e8c5e5cec26dea02fea5c3b21155b708b6500332..92d016a366f7733774236bdeac1879c412f70bb0 100644
index 8856936f6b0a270a9aba9482c248a89a115dcdd1..785a5dc41b593d67ac94e0bb9af08701a94782b7 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -247,6 +247,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
{ContentSettingsType::CONTROLLED_FRAME, nullptr},
@@ -248,6 +248,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
// POINTER_LOCK has been deprecated.
{ContentSettingsType::POINTER_LOCK, nullptr},
{ContentSettingsType::REVOKED_DISRUPTIVE_NOTIFICATION_PERMISSIONS, nullptr},
+ BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST
});
static_assert(
@@ -507,6 +508,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -508,6 +509,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
@@ -18,7 +18,7 @@ index e8c5e5cec26dea02fea5c3b21155b708b6500332..92d016a366f7733774236bdeac1879c4
for (const auto& entry : kContentSettingsTypeGroupNames) {
// Content setting types that aren't represented in the settings UI
// will have `nullptr` as their `name`. However, converting `nullptr`
@@ -521,6 +523,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
@@ -522,6 +524,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
}
std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
@@ -26,7 +26,7 @@ index e8c5e5cec26dea02fea5c3b21155b708b6500332..92d016a366f7733774236bdeac1879c4
for (const auto& entry : kContentSettingsTypeGroupNames) {
if (type == entry.type) {
// Content setting types that aren't represented in the settings UI
@@ -697,6 +700,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
@@ -698,6 +701,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
SiteSettingSource ProviderTypeToSiteSettingsSource(
const ProviderType provider_type) {
switch (provider_type) {
@@ -34,7 +34,7 @@ index e8c5e5cec26dea02fea5c3b21155b708b6500332..92d016a366f7733774236bdeac1879c4
case ProviderType::kWebuiAllowlistProvider:
return SiteSettingSource::kAllowlist;
case ProviderType::kPolicyProvider:
@@ -722,6 +726,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
@@ -723,6 +727,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
std::string ProviderToDefaultSettingSourceString(const ProviderType provider) {
switch (provider) {
patches/chrome-common-extensions-api-developer_private.idl.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
index d65deafb7913578b1955013ba8bfa8d8b02957df..8536ed9bcdebd3f38e1b40fd3ab9e60075a33e18 100644
index 8b09424e0c4cd409f1693ba06eb69d800f948473..7341c79c9647c07320733829314638d7b7c6c799 100644
--- a/chrome/common/extensions/api/developer_private.idl
+++ b/chrome/common/extensions/api/developer_private.idl
@@ -256,6 +256,7 @@ namespace developerPrivate {
DOMString iconUrl;
@@ -257,6 +257,7 @@ namespace developerPrivate {
DOMString id;
AccessModifier incognitoAccess;
AccessModifier userScriptsAccess;
+ boolean isSplitMode;
DOMString[] installWarnings;
boolean isCommandRegistrationHandledExternally;
patches/components-content_settings-core-common-content_settings_enums.mojom.patch
+8 -8
View File
@@ -1,12 +1,12 @@
diff --git a/components/content_settings/core/common/content_settings_enums.mojom b/components/content_settings/core/common/content_settings_enums.mojom
index 11a77ef2e0f5b1e6b5b1ea6a888b19400c8d9376..f2075e79d8a1f115ecea8ae38e8c850759abeef4 100644
index ca1647986c01e3651378fa1d359a091d9935aba0..94b74395223374357b6c9376284a5ced610d85de 100644
--- a/components/content_settings/core/common/content_settings_enums.mojom
+++ b/components/content_settings/core/common/content_settings_enums.mojom
@@ -75,6 +75,7 @@ enum SessionModel {
kNotificationAndroidProvider,
kOneTimePermissionProvider,
kPrefProvider,
+ kRemoteListProvider,
kDefaultProvider,
kNone,
@@ -76,6 +76,7 @@ enum ProviderType {
kOneTimePermissionProvider,
kPrefProvider,
kJavascriptOptimizerAndroidProvider,
+ kRemoteListProvider,
// The following providers are for tests only. The priority is intentionally
// higher than kDefaultProvider.
patches/components-content_settings-core-common-cookie_settings_base.cc.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc
index edfab3eb9a79abecf2b184b33d3c0731bd85d75e..cfc1d50015428eb67a4f38924a6ebab52b855779 100644
index 6cacad19cc3b30fc22b972aa65c6fb9c26beb373..e8ccc91db0e1963b0fdf0cc1851f36d1a2ceaaae 100644
--- a/components/content_settings/core/common/cookie_settings_base.cc
+++ b/components/content_settings/core/common/cookie_settings_base.cc
@@ -572,6 +572,7 @@ CookieSettingsBase::DecideAccess(
@@ -573,6 +573,7 @@ CookieSettingsBase::DecideAccess(const GURL& url,
return BlockAllCookies{};
}
@@ -10,10 +10,10 @@ index edfab3eb9a79abecf2b184b33d3c0731bd85d75e..cfc1d50015428eb67a4f38924a6ebab5
if (!is_third_party_request) {
return AllowAllCookies{ThirdPartyCookieAllowMechanism::kNone};
}
@@ -758,6 +759,7 @@ CookieSettingsBase::GetCookieSettingInternal(
@@ -752,6 +753,7 @@ CookieSettingsBase::GetCookieSettingInternal(
if (absl::holds_alternative<AllowPartitionedCookies>(choice)) {
CHECK(is_third_party_request, base::NotFatalUntil::M128);
CHECK(global_setting_or_embedder_blocks_third_party_cookies,
base::NotFatalUntil::M128);
CHECK(block_third_party_cookies, base::NotFatalUntil::M128);
+ BRAVE_COOKIE_SETTINGS_BASE_GET_COOKIES_SETTINGS_INTERNAL_IS_EXPLICIT_SETTING
CHECK(!is_explicit_setting, base::NotFatalUntil::M128);
patches/components-download-public-background_service-BUILD.gn.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/components/download/public/background_service/BUILD.gn b/components/download/public/background_service/BUILD.gn
index 1cdb334db8c6edc3984a998e3fa23277cafc05d0..cc2358c70286584e7f3a3edad7d8a6acba496d4c 100644
index f5b1cb64a876718afde6f5c8a880c043fc4db7fd..1f0c3d061d6b4abee833bb75fbce127162e30510 100644
--- a/components/download/public/background_service/BUILD.gn
+++ b/components/download/public/background_service/BUILD.gn
@@ -34,6 +34,7 @@ component("public") {
"blob_context_getter_factory.h",
@@ -35,6 +35,7 @@ component("public") {
"logger.h",
"navigation_monitor.h",
"url_loader_factory_getter.h",
+ "//brave/chromium_src/components/download/public/background_service/url_loader_factory_getter.h",
]
}
patches/components-history-core-browser-BUILD.gn.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn
index 629e30d3a3a0e44b5450e0f53f137d71f9333a02..efeaef25e1487a05825cee8cf80b993faca64c7b 100644
index bda35189adfe6bc437c5ebf0a47ea36388312a32..e43e5db43bb5b08409523b6cf9664b0e7e50d41d 100644
--- a/components/history/core/browser/BUILD.gn
+++ b/components/history/core/browser/BUILD.gn
@@ -153,6 +153,7 @@ static_library("browser") {
"android/visit_sql_handler.h",
]
}
@@ -134,6 +134,7 @@ static_library("browser") {
"//ui/gfx",
"//url",
]
+ import("//brave/components/history/core/browser/sources.gni") sources += brave_components_history_core_browser_sources deps += brave_components_history_core_browser_deps
}
patches/components-vector_icons-aggregate_vector_icons.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/vector_icons/aggregate_vector_icons.py b/components/vector_icons/aggregate_vector_icons.py
index 374b5297eefbe9369494b879577f22326c45c469..330c28ee623849c0f322369fd29a73bed9d973fa 100644
index 1974b6fc9eaa2a9f42c7059c25ab8d41108338ef..33587f91977b874c728cb077dbccabf404a9ce4f 100644
--- a/components/vector_icons/aggregate_vector_icons.py
+++ b/components/vector_icons/aggregate_vector_icons.py
@@ -251,5 +251,6 @@ def main():
patches/extensions-browser-user_script_manager.h.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/browser/user_script_manager.h b/extensions/browser/user_script_manager.h
index faaf3db52b3e6795764dcc5cc5569e850ac09669..e59c71cfeff766dd38dd41ac2b158bd6bf6836dd 100644
index 4b4d25e68c06835c1f7d84daa43080606527b297..b030c08839ba70144b5810019889708a501dc0ca 100644
--- a/extensions/browser/user_script_manager.h
+++ b/extensions/browser/user_script_manager.h
@@ -25,7 +25,7 @@
@@ -11,8 +11,8 @@ index faaf3db52b3e6795764dcc5cc5569e850ac09669..e59c71cfeff766dd38dd41ac2b158bd6
namespace extensions {
class UserScriptLoader;
@@ -55,6 +55,7 @@ class UserScriptManager : public ExtensionRegistryObserver {
bool enabled);
@@ -61,6 +61,7 @@ class UserScriptManager : public ExtensionRegistryObserver {
void SetUserScriptPrefEnabled(const ExtensionId& extension, bool enabled);
private:
+ friend class ::EthereumRemoteClientService;
patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch
+5 -5
View File
@@ -1,16 +1,16 @@
diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
index 18539a0731183f13ea4ef9e8cf7e008417f977e1..1093737af764831e4804df0097385b8d66413ef8 100644
index 8622f98a6fdd370a5ab86bc75a153ac003d6b8ed..e57c41f3b8ada3129cd522c16ab40dd190509b7b 100644
--- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
@@ -688,6 +688,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kChromeDataRegionSetting, 0);
@@ -662,6 +662,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kYoutubeIncognitoHasBeenShown, false);
registry->RegisterIntegerPref(
prefs::kNTPHomeCustomizationNewBadgeImpressionCount, 0);
+ BRAVE_REGISTER_LOCAL_STATE_PREFS
}
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1044,6 +1045,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1037,6 +1038,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Deprecated 12/2024.
registry->RegisterBooleanPref(kPageContentCollectionEnabled, false);
patches/net-socket-socks5_client_socket.h.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef2042341979e88 100644
index 41046ef34518e4027bef82325c94d0e90108499a..b3f27d5a4ddb35a1b1a605e445c2d93783291430 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -75,11 +75,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
@@ -78,11 +78,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
int GetLocalAddress(IPEndPoint* address) const override;
private:
@@ -17,7 +17,7 @@ index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef20423
STATE_HANDSHAKE_WRITE,
STATE_HANDSHAKE_WRITE_COMPLETE,
STATE_HANDSHAKE_READ,
@@ -114,6 +117,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
@@ -117,6 +120,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
int DoGreetReadComplete(int result);
int DoGreetWrite();
int DoGreetWriteComplete(int result);
@@ -29,5 +29,5 @@ index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef20423
+ NetLogWithSource& net_log,
+ CompletionRepeatingCallback& callback);
// Writes the SOCKS handshake buffer into |handshake|
// and return OK on success.
// Creates a DrainableIOBuffer containing the SOCKS handshake.
scoped_refptr<DrainableIOBuffer> BuildHandshakeWriteBuffer() const;
patches/net-socket-socks_connect_job.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc
index 548442034c228b51f52d0b33f4df7363fc32829b..54e5778b85c091a3a98f908523a4fca2bd203383 100644
index 79862bda68ff8979d242956735070d944f3f8050..a41ac1d77d78423211080ef5a944b8051ab4c167 100644
--- a/net/socket/socks_connect_job.cc
+++ b/net/socket/socks_connect_job.cc
@@ -176,9 +176,11 @@ int SOCKSConnectJob::DoSOCKSConnect() {
@@ -185,9 +185,11 @@ int SOCKSConnectJob::DoSOCKSConnect() {
// Add a SOCKS connection on top of the tcp socket.
if (socks_params_->is_socks_v5()) {
@@ -15,5 +15,5 @@ index 548442034c228b51f52d0b33f4df7363fc32829b..54e5778b85c091a3a98f908523a4fca2
+ socks_params_->traffic_annotation(),
+ socks_params_->transport_params()->destination());
} else {
// TODO(crbug.com/393349123): Handle resolved DNS aliases for socks4.
auto socks_socket = std::make_unique<SOCKSClientSocket>(
transport_connect_job_->PassSocket(), socks_params_->destination(),
patches/third_party-blink-common-client_hints-client_hints.cc.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
index dbe267eed12d5c91b2eee3d0e129363963f05f5f..10b61a806aea339702f301d5ceae5c088b2e43a6 100644
index d55147ee204bf2277b5aa0ff9464a32405b3efd9..e282c22dcb90af199f1031e612c55fe053c7146d 100644
--- a/third_party/blink/common/client_hints/client_hints.cc
+++ b/third_party/blink/common/client_hints/client_hints.cc
@@ -107,6 +107,7 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
}
@@ -21,6 +21,7 @@
namespace blink {
bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
+ BRAVE_CLIENT_HINTS_IS_CLIENT_HINT_SENT_BY_DEFAULT
patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
index f29a94af92372abc1c261a37510a62f5f34df220..317405dca1deef8054d025b4a0f9735ea3a9d863 100644
index eb6fbcf79581fbbf8f067b82eaa7151d483842dc..eb5ac0f52b91fb28238c905e55a079b4cb3468f1 100644
--- a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
+++ b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc
@@ -158,6 +158,7 @@ const FontData* FontFallbackList::GetFontData(
font_selector_->ReportFontLookupByUniqueOrFamilyName(
curr_family->FamilyName(), font_description,
DynamicTo<SimpleFontData>(result));
@@ -155,6 +155,7 @@ const FontData* FontFallbackList::GetFontData(
if (!result && !curr_family->FamilyName().empty()) {
result = FontCache::Get().GetFontData(font_description,
curr_family->FamilyName());
+ BRAVE_GET_FONT_DATA
}
if (result) {
patches/third_party-lit-v3_0-BUILD.gn.patch
+4 -4
View File
@@ -1,16 +1,16 @@
diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn
index 2380b3f2172308a9051702678f31dc65a38d6901..3c187629cb617fa053ae358e4f3838378397efcf 100644
index 525a853b6ee927a0be9aebf92307ee544383ba98..58eddd0d10e27cbba6af4016184a916ff978828f 100644
--- a/third_party/lit/v3_0/BUILD.gn
+++ b/third_party/lit/v3_0/BUILD.gn
@@ -98,6 +98,7 @@ ts_library("build_ts") {
@@ -105,6 +105,7 @@ ts_library("build_ts") {
"//ui/webui/resources/cr_components/most_visited:build_ts",
"//ui/webui/resources/cr_components/theme_color_picker:build_ts",
"//ui/webui/resources/cr_elements:build_ts",
+ "//chrome/browser/resources/settings:build_ts", "//brave/ui/webui/resources:build_ts"
]
tsconfig_base = "tsconfig_base.json"
composite = true
in_files = [
@@ -181,6 +182,7 @@ ts_library("build_ts") {
@@ -189,6 +190,7 @@ ts_library("build_ts") {
"${node_modules}/@lit/reactive-element/reactive-element.d.ts",
target_gen_dir),
]
patches/third_party-rust-chromium_crates_io-vendor-cxx-1.0.137-include-cxx.h.patch → patches/third_party-rust-chromium_crates_io-vendor-cxx-1.0.141-include-cxx.h.patch
+5 -5
View File
@@ -1,7 +1,7 @@
diff --git a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.137/include/cxx.h b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.137/include/cxx.h
index 3414e4c8a5434f6d43b8bf7a76e634ac0c7d06a5..03fa9bf730156c0926aef35bcf3fc0a98c98a0db 100644
--- a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.137/include/cxx.h
+++ b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.137/include/cxx.h
diff --git a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.141/include/cxx.h b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.141/include/cxx.h
index 9d638951eba600a055186dce5598c6c0cacc14ef..bbc027da47425e5b89f2a85f24e218b6e68a39d7 100644
--- a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.141/include/cxx.h
+++ b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.141/include/cxx.h
@@ -2,6 +2,7 @@
#include <algorithm>
#include <array>
@@ -10,7 +10,7 @@ index 3414e4c8a5434f6d43b8bf7a76e634ac0c7d06a5..03fa9bf730156c0926aef35bcf3fc0a9
#include <cstddef>
#include <cstdint>
#include <exception>
@@ -244,6 +245,12 @@ public:
@@ -258,6 +259,12 @@ public:
bool operator>(const iterator &) const noexcept;
bool operator>=(const iterator &) const noexcept;
patches/third_party-rust-chromium_crates_io-vendor-cxxbridge-cmd-1.0.137-src-gen-include-cxx.h.patch → patches/third_party-rust-chromium_crates_io-vendor-cxxbridge-cmd-1.0.141-src-gen-include-cxx.h.patch
+5 -5
View File
@@ -1,7 +1,7 @@
diff --git a/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.137/src/gen/include/cxx.h b/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.137/src/gen/include/cxx.h
index 3414e4c8a5434f6d43b8bf7a76e634ac0c7d06a5..ab588972ad1236c81c9195e77eda20f387da5be5 100644
--- a/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.137/src/gen/include/cxx.h
+++ b/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.137/src/gen/include/cxx.h
diff --git a/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.141/src/gen/include/cxx.h b/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.141/src/gen/include/cxx.h
index 9d638951eba600a055186dce5598c6c0cacc14ef..05d3739ebf245619a2d7d67af8f6027def56d858 100644
--- a/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.141/src/gen/include/cxx.h
+++ b/third_party/rust/chromium_crates_io/vendor/cxxbridge-cmd-1.0.141/src/gen/include/cxx.h
@@ -2,6 +2,7 @@
#include <algorithm>
#include <array>
@@ -10,7 +10,7 @@ index 3414e4c8a5434f6d43b8bf7a76e634ac0c7d06a5..ab588972ad1236c81c9195e77eda20f3
#include <cstddef>
#include <cstdint>
#include <exception>
@@ -243,6 +244,11 @@ public:
@@ -257,6 +258,11 @@ public:
bool operator<=(const iterator &) const noexcept;
bool operator>(const iterator &) const noexcept;
bool operator>=(const iterator &) const noexcept;
patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/front_end/panels/application/ApplicationPanelSidebar.ts b/front_end/panels/application/ApplicationPanelSidebar.ts
index fb6a98cebe37a82b163f9659a4b3aa6942e60a5b..79941a941fec2e17e381b83279fb25e94ec17b3c 100644
index 9bb428622183a39df5101dbe6c98e5a66c96ee1c..108984b70a398fa8b703bd0f12e39a7c906e481e 100644
--- a/front_end/panels/application/ApplicationPanelSidebar.ts
+++ b/front_end/panels/application/ApplicationPanelSidebar.ts
@@ -571,6 +571,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe
// Work-around for crbug.com/1152713: Something is wrong with custom scrollbars and size containment.
// @ts-ignore
@@ -569,6 +569,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe
new Common.ObjectWrapper.ObjectWrapper<SharedStorageTreeElementDispatcher.EventTypes>();
this.contentElement.style.contain = 'layout style';
+ [this.trustTokensTreeElement, this.interestGroupTreeElement, this.sharedStorageListTreeElement].forEach(e => storageTreeElement.removeChild(e)); [this.backgroundFetchTreeElement, this.backgroundSyncTreeElement, this.periodicBackgroundSyncTreeElement, this.reportingApiTreeElement].forEach(e => backgroundServiceTreeElement.removeChild(e));
}
patches/tools-crates-gnrt-lib-readme.rs.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/tools/crates/gnrt/lib/readme.rs b/tools/crates/gnrt/lib/readme.rs
index 1dbbd36a3c2a41ec391f39a6069d8305908dfcec..3e0909430b97b5287940a631c7f2d8b37763b2b5 100644
index 90dd8123c6ce330e541fc2fc18a54cf58a0a6110..8fafb4de558e2b586ca00247868b1e13307dff51 100644
--- a/tools/crates/gnrt/lib/readme.rs
+++ b/tools/crates/gnrt/lib/readme.rs
@@ -122,7 +122,7 @@ pub fn readme_file_from_package<'a>(
@@ -10,8 +10,8 @@ index 1dbbd36a3c2a41ec391f39a6069d8305908dfcec..3e0909430b97b5287940a631c7f2d8b3
+ let does_crbug_369075726_apply = true || !shipped
&& crate_config
.as_ref()
.map_or(false, |cfg| cfg.no_license_file_tracked_in_crbug_369075726);
@@ -198,6 +198,9 @@ enum LicenseKind {
.is_some_and(|cfg| cfg.no_license_file_tracked_in_crbug_369075726);
@@ -199,6 +199,9 @@ enum LicenseKind {
/// https://spdx.org/licenses/Unicode-3.0.html
Unicode3,
@@ -21,7 +21,7 @@ index 1dbbd36a3c2a41ec391f39a6069d8305908dfcec..3e0909430b97b5287940a631c7f2d8b3
}
impl Display for LicenseKind {
@@ -212,6 +215,9 @@ impl Display for LicenseKind {
@@ -213,6 +216,9 @@ impl Display for LicenseKind {
LicenseKind::ISC => write!(f, "ISC"),
LicenseKind::Zlib => write!(f, "Zlib"),
LicenseKind::Unicode3 => write!(f, "Unicode-3.0"),
@@ -31,7 +31,7 @@ index 1dbbd36a3c2a41ec391f39a6069d8305908dfcec..3e0909430b97b5287940a631c7f2d8b3
}
}
}
@@ -257,6 +263,11 @@ static LICENSE_STRING_TO_LICENSE_KIND: LazyLock<HashMap<&'static str, Vec<Licens
@@ -258,6 +264,11 @@ static LICENSE_STRING_TO_LICENSE_KIND: LazyLock<HashMap<&'static str, Vec<Licens
h.insert("BSD-2-Clause OR Apache-2.0 OR MIT", vec![LicenseKind::Apache2]);
h.insert("Unicode-3.0", vec![LicenseKind::Unicode3]);
h.insert("Zlib", vec![LicenseKind::Zlib]);
@@ -43,7 +43,7 @@ index 1dbbd36a3c2a41ec391f39a6069d8305908dfcec..3e0909430b97b5287940a631c7f2d8b3
h
});
@@ -285,6 +296,9 @@ static LICENSE_KIND_TO_LICENSE_FILES: LazyLock<HashMap<LicenseKind, Vec<&'static
@@ -286,6 +297,9 @@ static LICENSE_KIND_TO_LICENSE_FILES: LazyLock<HashMap<LicenseKind, Vec<&'static
h.insert(LicenseKind::ISC, vec!["LICENSE-ISC", "LICENSE.md", "LICENSE"]);
h.insert(LicenseKind::Zlib, vec!["LICENSE-ZLIB", "LICENSE.md", "LICENSE"]);
h.insert(LicenseKind::Unicode3, vec!["LICENSE-UNICODE", "LICENSE.md", "LICENSE"]);
patches/tools-gritsettings-resource_ids.spec.patch
+3 -3
View File
@@ -21,7 +21,7 @@ index 80494b5bb318a9dc4b92b4d2fbb3fab84521d8a9..86a7793311f0970491ca7199f02535b3
"includes": [3920],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/family_link_user_internals/resources.grd": {
@@ -573,7 +576,7 @@
@@ -577,7 +580,7 @@
"includes": [4720],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/resources.grd": {
@@ -30,7 +30,7 @@ index 80494b5bb318a9dc4b92b4d2fbb3fab84521d8a9..86a7793311f0970491ca7199f02535b3
"includes": [4740],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings_shared/resources.grd": {
@@ -947,6 +950,9 @@
@@ -951,6 +954,9 @@
# Big alignment at start of section.
"messages": [7020],
},
@@ -40,7 +40,7 @@ index 80494b5bb318a9dc4b92b4d2fbb3fab84521d8a9..86a7793311f0970491ca7199f02535b3
"components/components_google_chrome_strings.grd": {
"messages": [7020],
},
@@ -1438,7 +1444,7 @@
@@ -1447,7 +1453,7 @@
"includes": [9980],
},
"<(SHARED_INTERMEDIATE_DIR)/ui/webui/resources/webui_resources.grd": {
patches/ui-base-accelerators-accelerator.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index 1f90103d1ddb04a24797cf1214c3d0c862d77e9f..3296fd12009e1050b1119eed737ceb0513c8f120 100644
index 5590f9d425229d87373c5b53651d2e2d17b779e4..75def292e624a09cc0894660a2b5176eae877282 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -315,6 +315,7 @@ std::u16string Accelerator::KeyCodeToName() const {
@@ -9,4 +9,4 @@ index 1f90103d1ddb04a24797cf1214c3d0c862d77e9f..3296fd12009e1050b1119eed737ceb05
+ BRAVE_UI_BASE_ACCELERATOR_APPLY_LONG_FORM_MODIFIERS_
std::u16string result = shortcut;
if (IsShiftDown())
if (IsShiftDown()) {
patches/v8/BUILD.gn.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/BUILD.gn b/BUILD.gn
index 3fd37aa586b0cd8c02628bf6a5c58ba64f6002dd..c313da6bdf4c2e92dbcfc1652ebd1538ca418614 100644
index ef1d419a4895f83b850757b0b066efed677fea0d..45b9bbd4d5061647af3cd647455adc70708a69a8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -814,6 +814,7 @@ config("internal_config_base") {
@@ -10,8 +10,8 @@ index 3fd37aa586b0cd8c02628bf6a5c58ba64f6002dd..c313da6bdf4c2e92dbcfc1652ebd1538
}
config("internal_config") {
@@ -3168,6 +3169,7 @@ v8_header_set("v8_headers") {
":cppgc_headers",
@@ -3170,6 +3171,7 @@ v8_header_set("v8_headers") {
":v8_tracing",
":v8_version",
]
+ import("//brave/v8/sources.gni") sources += brave_v8_headers_sources public_deps += brave_v8_headers_public_deps