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

Conflict-resolved patches from Chromium 144.0.7559.97 to Chromium 145.0.7630.1.

Browse Source
This commit is contained in:
Claudio DeSouza
2026-01-29 13:40:15 -05:00
committed by Max Karolinskiy
parent eb640bd57a
commit b703cbbb54
32 changed files with 148 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-test-launcher-test_results_tracker.cc.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
index 0641d9b37f26f69a898ce6640e2904fcbc7abfd8..afd080ace72b9376556c701043ca4183de573047 100644
index 760f0982cf35b9294cb916da82e7b39aa522142c..06642daac8a193e476279413fe35555a5e85e0b0 100644
--- a/base/test/launcher/test_results_tracker.cc
+++ b/base/test/launcher/test_results_tracker.cc
@@ -307,6 +307,7 @@ TestResultsTracker::~TestResultsTracker() {
: ""),
result.GetTestCaseName().c_str());
@@ -304,6 +304,7 @@ TestResultsTracker::~TestResultsTracker() {
: ""),
result.GetTestCaseName().c_str()));
if (result.status != TestResult::TEST_SUCCESS) {
+ TEST_RESULTS_TRACKER_ADD_FAILURE_DETAILS
// The actual failure message is not propagated up to here, as it's too
patches/build-config-android-rules.gni.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 2aebf6c79f8ca0ad027f0545d380b180efb04b95..1c3f48cc9a2bb63c6b2a1e561505217c30a950e3 100644
index a8ab90ddd0bc27a094a79d1e36d1dc9c00537786..d49939c691d02a568e0f98f415427c9d8a3fb05d 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) {
@@ -8,9 +8,9 @@ index 2aebf6c79f8ca0ad027f0545d380b180efb04b95..1c3f48cc9a2bb63c6b2a1e561505217c
template("java_cpp_enum") {
+ foreach(source, invoker.sources) { foreach(filter, brave_java_cpp_enum_filter) { if(source == filter) { invoker.sources -= [filter] }}}
action_with_pydeps(target_name) {
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ])
@@ -397,6 +398,7 @@ if (!is_robolectric && enable_java_templates) {
forward_variables_from(invoker,
TESTONLY_AND_VISIBILITY + [
@@ -401,6 +402,7 @@ if (!is_robolectric && enable_java_templates) {
# output = "$target_gen_dir/AndroidManifest.xml"
# }
template("jinja_template") {
patches/chrome-android-BUILD.gn.patch
+13 -13
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a2529d0995d4 100644
index cf414ac9497ba17a5963d3a0d2bb253364cecc1d..97d950c0da5c6599bb53c578df4fb6a67bc16503 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -162,6 +162,7 @@ if (_is_default_toolchain) {
@@ -10,7 +10,7 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
}
android_resources("chrome_app_java_resources") {
@@ -262,6 +263,7 @@ if (_is_default_toolchain) {
@@ -263,6 +264,7 @@ if (_is_default_toolchain) {
if (enable_extensions_core) {
deps += [ "//chrome/browser/ui/android/extensions:java_resources" ]
}
@@ -18,7 +18,7 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
}
android_resources("java_overlay_resources") {
@@ -794,6 +796,7 @@ if (_is_default_toolchain) {
@@ -800,6 +802,7 @@ if (_is_default_toolchain) {
]
deps += feed_deps
@@ -26,7 +26,7 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
srcjar_deps = [
":chrome_android_java_enums_srcjar",
@@ -810,6 +813,7 @@ if (_is_default_toolchain) {
@@ -817,6 +820,7 @@ if (_is_default_toolchain) {
"//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
"//components/touch_to_search/core/browser:quick_action_category_enum_javagen",
]
@@ -34,9 +34,9 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
# From java_sources.gni.
sources = chrome_java_sources
@@ -947,6 +951,7 @@ if (_is_default_toolchain) {
"//chrome/browser/ui/browser_window/stub:java",
]
@@ -950,6 +954,7 @@ if (_is_default_toolchain) {
# TODO(crbug.com/434123514): see if we can remove these stub targets.
deps += [ "//chrome/browser/ui/android/extensions/windowing/stub:java" ]
}
+ deps += brave_chrome_all_java_deps
}
@@ -50,15 +50,15 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -1892,6 +1898,7 @@ if (_is_default_toolchain) {
@@ -1826,6 +1832,7 @@ if (_is_default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
+ deps += [ "//brave:brave_pak_assets" ]
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
}
@@ -2181,6 +2188,7 @@ if (_is_default_toolchain) {
}
}
@@ -2084,6 +2091,7 @@ if (_is_default_toolchain) {
"//third_party/androidx:androidx_annotation_annotation_experimental_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -66,7 +66,7 @@ index 81be446f42d593e826d60592c05068cf95361b83..baf9b0eeaeb0899a9b708e55ef33a252
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -3173,6 +3181,7 @@ if (_is_default_toolchain) {
@@ -3066,6 +3074,7 @@ if (_is_default_toolchain) {
"java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
"java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
]
patches/chrome-android-chrome_public_apk_tmpl.gni.patch
+7 -7
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index fd5405b1aae1bf36a017cc98909a0a2db53b8ee4..dece9cb81614c3c1a45401919424855de9ef9557 100644
index d079c147a169f57c7668057847c23d26ca3962f2..778327370536544fdbd8604e1bab534c921353a8 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -328,6 +328,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -291,6 +291,7 @@ template("chrome_common_apk_or_module_tmpl") {
"*ic_file_download_white*", # Bottom edge seems misaligned.
"*ic_lock.*", # Bottom edge seems misaligned.
]
@@ -10,15 +10,15 @@ index fd5405b1aae1bf36a017cc98909a0a2db53b8ee4..dece9cb81614c3c1a45401919424855d
# Most of these, with the exception of resource_exclusion_exceptions,
# are currently duplicated in system_webview_apk_tmpl.gni.
@@ -352,6 +353,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -315,6 +316,7 @@ template("chrome_common_apk_or_module_tmpl") {
proguard_enabled = true
proguard_configs = [ "//chrome/android/proguard/main.flags" ]
+ proguard_configs += [ "//brave/android/java/proguard.flags" ]
if (_is_monochrome) {
proguard_configs +=
[ "//android_webview/nonembedded/java/proguard.flags" ]
@@ -760,6 +762,7 @@ template("chrome_common_apk_or_module_tmpl") {
if (_is_test) {
proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ]
}
@@ -665,6 +667,7 @@ template("chrome_common_apk_or_module_tmpl") {
"version_code",
"version_name",
])
patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
index b4db43786e47518273c67982cefa2ccece15f4c9..0a3a4071bc540a6ae2758173b6eb94655d5e6e9c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
@@ -76,7 +76,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
p.setSummary(AboutSettingsBridge.getOSVersion());
p = findPreference(PREF_LEGAL_INFORMATION);
assumeNonNull(p);
- int currentYear = CalendarFactory.get().get(Calendar.YEAR);
+ Calendar calendar = CalendarFactory.get();
+ calendar.setTimeInMillis(System.currentTimeMillis());
+ int currentYear = calendar.get(Calendar.YEAR);
p.setSummary(getString(R.string.legal_information_summary, currentYear));
}
patches/chrome-browser-browser_process_impl.h.patch
+5 -5
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 863dad75158761a4fc02623ac096d93abef7b24a..e9db37f1c049b694161e884ae7fc65c271687d77 100644
index d51701355e3bf1157c5123a20b4b01f52a73e95a..4595c9854be36ee6d4e7dec75ca9af0f6515b937 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -242,6 +242,7 @@ class BrowserProcessImpl : public BrowserProcess,
void CreateGlobalFeaturesForTesting() override;
@@ -243,6 +243,7 @@ class BrowserProcessImpl : public BrowserProcess,
GlobalFeatures* GetFeatures() override;
private:
+ friend class BraveBrowserProcessImpl;
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
// KeepAliveStateObserver implementation
patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
+4 -4
View File
@@ -1,13 +1,13 @@
diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
index c6135de9d60bc8e7cfb2e64b1eae0b33892f76e1..b0856d8bd6b4a763dc8b663742edabe39d200d46 100644
index 7d3fc0b29ddb80363df528a28c04079968733441..6a230aa33c73e85c1ddfc8346e51a553e414a464 100644
--- a/chrome/browser/resources/bookmarks/command_manager.ts
+++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -460,7 +460,7 @@ export class BookmarksCommandManagerElement extends
@@ -473,7 +473,7 @@ export class BookmarksCommandManagerElement extends
chrome.bookmarkManagerPrivate.export();
break;
case Command.HELP_CENTER:
- window.open('https://support.google.com/chrome/?p=bookmarks');
+ window.open('https://community.brave.app', undefined, 'noreferrer');
break;
default:
assertNotReached();
case Command.OPEN_BOOKMARK:
case Command.OPEN_FOLDER:
patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts
index afe730971495212258a609dd09b74baf7cea6bf2..2ec966a0928bc5cb7ac917bf3de8a3955c460aa8 100644
index afeed7c6d9702e0a5e6994dc9170cedeb2a3f010..8fc96e93c3f15d0aac0c47898c4fffac2a5fa7fd 100644
--- a/chrome/browser/resources/settings/people_page/sync_controls.ts
+++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
@@ -183,7 +183,7 @@ export class SettingsSyncControlsElement extends
@@ -11,7 +11,7 @@ index afe730971495212258a609dd09b74baf7cea6bf2..2ec966a0928bc5cb7ac917bf3de8a395
this.syncBrowserProxy_.didNavigateToSyncPage();
}
// <if expr="not is_chromeos">
@@ -381,6 +381,7 @@ export class SettingsSyncControlsElement extends
@@ -376,6 +376,7 @@ export class SettingsSyncControlsElement extends
private disableTypeCheckBox_(
syncStatus: SyncStatus, syncAllDataTypes: boolean,
dataTypeManaged: boolean): boolean {
patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker.ts b/chrome/browser/resources/signin/profile_picker/profile_picker.ts
index 94ad0ce0598bc570e03ab3d8518708baec5189ce..685ec66568d2d4501d9855ee9f8b09cb1dd08e87 100644
index 2639e910d0c5d00389f993fc3f66f7c77f2ba99a..cb5fa5595345b57a0730f18e6ac0782ab2c86a0b 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker.ts
@@ -2,6 +2,7 @@
@@ -9,4 +9,4 @@ index 94ad0ce0598bc570e03ab3d8518708baec5189ce..685ec66568d2d4501d9855ee9f8b09cb
+import 'chrome://resources/brave/polymer_overriding.js'
export {loadTimeData} from 'chrome://resources/js/load_time_data.js';
export {ensureLazyLoaded} from './ensure_lazy_loaded.js';
export {AutogeneratedThemeColorInfo, ManageProfilesBrowserProxy, ManageProfilesBrowserProxyImpl, ProfileState, UserThemeChoice} from './manage_profiles_browser_proxy.js';
export {ManageProfilesBrowserProxyImpl} from './manage_profiles_browser_proxy.js';
patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
+4 -4
View File
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 08a3f92edb9d446da7a8a064c66df84831904c70..cca7c819750078289099fa277f0e1bd0b6c6658d 100644
index 05fd645a802ad73f65457f03488b49ee48d3eddc..67d5a18760848a5e59f89b97fa69f165acc218e7 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -142,6 +142,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/StripVisibilityState.java",
@@ -141,6 +141,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java",
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java",
]
+ sources += brave_browser_ui_android_toolbar_sources
deps = [
":java_resources",
@@ -392,6 +393,7 @@ android_resources("java_resources") {
@@ -372,6 +373,7 @@ android_resources("java_resources") {
"//components/browser_ui/styles/android:java_resources",
"//ui/android:ui_java_resources",
]
patches/chrome-browser-ui-browser_ui_prefs.cc.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 1b3eb32613379e586338e37f1ca147742b2431d9..3b5999edb9f90e53b0b650c50b29766b383b4655 100644
index e94568b1c754238ed2190174b5b0f5cce4f7f84b..8e77bb29873aded4893739821b9e59676ca6879d 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -8,6 +8,6 @@ index 1b3eb32613379e586338e37f1ca147742b2431d9..3b5999edb9f90e53b0b650c50b29766b
translate::prefs::kOfferTranslateEnabled, true,
- user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ user_prefs::PrefRegistrySyncable::NO_REGISTRATION_FLAGS);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 951608e4b3bddb2781092226f21fa5c511468526..481df43ef3c2d54a5d759baa22719b141f742960 100644
index fe9a4e9c14a331facae33bcbaf705cedfd37aeb8..d72fed7417fb313f0a0840012c28d346daa50050 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -832,6 +832,7 @@ void LocationBarView::Layout(PassKey) {
@@ -845,6 +845,7 @@ void LocationBarView::Layout(PassKey) {
.indent_input_when_popup_closed) &&
!location_icon_view_->ShouldShowLabel() &&
!ShouldShowKeywordBubble();
@@ -10,7 +10,7 @@ index 951608e4b3bddb2781092226f21fa5c511468526..481df43ef3c2d54a5d759baa22719b14
if (should_indent) {
icon_left += 7 /*icon_indent*/;
icon_left += omnibox_feature_configs::AdjustOmniboxIndent()
@@ -919,6 +920,7 @@ void LocationBarView::Layout(PassKey) {
@@ -933,6 +934,7 @@ void LocationBarView::Layout(PassKey) {
}
selected_keyword_view_->SetCustomImage(image);
}
@@ -18,7 +18,7 @@ index 951608e4b3bddb2781092226f21fa5c511468526..481df43ef3c2d54a5d759baa22719b14
} else if (location_icon_view_->GetShowText() &&
!ShouldChipOverrideLocationIcon()) {
location_icon_view_->SetVisible(true);
@@ -984,6 +986,7 @@ void LocationBarView::Layout(PassKey) {
@@ -998,6 +1000,7 @@ void LocationBarView::Layout(PassKey) {
(info.num_legacy_page_actions_shown == 0) && !all_page_actions_migrated
? 4
: trailing_decorations_edge_padding;
@@ -26,7 +26,7 @@ index 951608e4b3bddb2781092226f21fa5c511468526..481df43ef3c2d54a5d759baa22719b14
add_trailing_decoration(page_action_icon_container_,
/*intra_item_padding=*/0,
/*edge_padding=*/
@@ -1007,6 +1010,7 @@ void LocationBarView::Layout(PassKey) {
@@ -1021,6 +1024,7 @@ void LocationBarView::Layout(PassKey) {
add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0,
/*edge_padding=*/trailing_decorations_edge_padding);
patches/chrome-browser-ui-views-page_info-page_info_cookies_content_view.cc.patch
+3 -3
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
index e6971128b7b3c7577545b68d5817a9c5bb4f8899..2c879d64197d10930edc3a89b7b6d2459fd48311 100644
index 9a72ef8c55f4aae8d277b2c94d8d9fb88bec56e0..4a423a5c1870f5d0bf1e170aa1b036d5a7eb992c 100644
--- a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
@@ -364,6 +364,7 @@ void PageInfoCookiesContentView::SetThirdPartyCookiesInfo(
@@ -334,6 +334,7 @@ void PageInfoCookiesContentView::SetThirdPartyCookiesInfo(
CookieControlsState controls_state,
CookieControlsEnforcement enforcement,
CookieBlocking3pcdStatus blocking_status,
base::Time expiration) {
+ BRAVE_PAGE_INFO_COOKIES_CONTENT_VIEW_SET_THIRD_PARTY_COOKIES_INFO
if (controls_state == CookieControlsState::kHidden) {
patches/chrome-browser-ui-views-tabs-dragging-dragging_tabs_session.h.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/tabs/dragging/dragging_tabs_session.h b/chrome/browser/ui/views/tabs/dragging/dragging_tabs_session.h
index f0cf1139ec6dfa7fa6fede4923bcc458896041a5..59cee2f1af52f163140a2e19d81070371da4d297 100644
index 632e0e0f11003b273796855f016232aa10d92c9b..28d7ce07ad69a3c45e0bd19b8307d50b38aae965 100644
--- a/chrome/browser/ui/views/tabs/dragging/dragging_tabs_session.h
+++ b/chrome/browser/ui/views/tabs/dragging/dragging_tabs_session.h
@@ -14,7 +14,7 @@
@@ -11,12 +11,12 @@ index f0cf1139ec6dfa7fa6fede4923bcc458896041a5..59cee2f1af52f163140a2e19d8107037
public:
// `drag_data` is a copy of the drag configuration for the full session.
// `attached_context` is the context in which the tabs are being dragged.
@@ -28,7 +28,7 @@ class DraggingTabsSession final {
float offset_to_width_ratio_,
bool initial_move,
gfx::Point point_in_screen);
@@ -30,7 +30,7 @@ class DraggingTabsSession final {
float offset_to_width_ratio_,
bool initial_move,
gfx::Point point_in_screen);
- ~DraggingTabsSession();
+ virtual ~DraggingTabsSession();
void MoveAttached(gfx::Point point_in_screen);
gfx::Rect GetEnclosingRectForDraggedTabs();
patches/chrome-browser-ui-webui-BUILD.gn.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn
index d122aff8937035b74b4ff6f681e19ac136ff8d7f..106e3eea81d5435d2021e794eeff01c7d5184301 100644
index 5860850fa981a75d796fcef62dfa03093d13b7f8..8096de8f94b769592fe65bb2baed9c75efe7f2e2 100644
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -132,6 +132,7 @@ source_set("configs") {
if (enable_session_service) {
deps += [ "//chrome/browser/ui/webui/tab_strip_internals" ]
@@ -136,6 +136,7 @@ source_set("configs") {
if (is_mac) {
deps += [ "//chrome/browser/ui/webui/unexportable_keys_internals" ]
}
+ import("//brave/browser/ui/webui/sources.gni") deps += brave_browser_ui_webui_configs_deps
}
patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+7 -7
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f9ad16202 100644
index b7ebd87adef8343c4e56635582a5b7d39b7afe70..0ba44000410c815554823918545073ed32caa114 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -259,6 +259,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
@@ -261,6 +261,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
{ContentSettingsType::DEVICE_ATTRIBUTES, nullptr},
{ContentSettingsType::PERMISSION_ACTIONS_HISTORY, nullptr},
{ContentSettingsType::SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL, nullptr},
@@ -10,7 +10,7 @@ index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f
});
static_assert(
@@ -533,6 +534,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -535,6 +536,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
@@ -18,7 +18,7 @@ index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f
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`
@@ -547,6 +549,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
@@ -549,6 +551,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
}
std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
@@ -26,7 +26,7 @@ index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f
for (const auto& entry : kContentSettingsTypeGroupNames) {
if (type == entry.type) {
// Content setting types that aren't represented in the settings UI
@@ -715,6 +718,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
@@ -723,6 +726,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
SiteSettingSource ProviderTypeToSiteSettingsSource(
const ProviderType provider_type) {
switch (provider_type) {
@@ -34,7 +34,7 @@ index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f
case ProviderType::kWebuiAllowlistProvider:
case ProviderType::kComponentExtensionProvider:
return SiteSettingSource::kAllowlist;
@@ -742,6 +746,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
@@ -750,6 +754,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
std::string ProviderToDefaultSettingSourceString(const ProviderType provider) {
switch (provider) {
@@ -42,7 +42,7 @@ index f2ed42efc5bbcb15a4756ebfd86a4c54fcf3aa74..ebf26275ffcb5da64d858ee0c693d78f
case ProviderType::kPolicyProvider:
return "policy";
case ProviderType::kSupervisedProvider:
@@ -868,6 +873,7 @@ base::Value::Dict GetExceptionForPage(
@@ -876,6 +881,7 @@ base::Value::Dict GetExceptionForPage(
exception.Set(kSource, SiteSettingSourceToString(source));
exception.Set(kIncognito, incognito);
exception.Set(kIsEmbargoed, is_embargoed);
patches/chrome-installer-util-shell_util.cc.patch
+8 -8
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 7da4a13cc3286d0690db50d8e8b6cd9426946942..a7c9a641d8865f788c0cd6113fb7254cebcebf25 100644
index ee2f2df58395ae37d0a1aec47fa795e5144d462c..ddd68281638cfde326870e6239117e9698310c21 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -375,6 +375,7 @@ void GetChromeProgIdEntries(
@@ -10,15 +10,15 @@ index 7da4a13cc3286d0690db50d8e8b6cd9426946942..a7c9a641d8865f788c0cd6113fb7254c
// Get ProgId entries for PDF documents.
app_info.prog_id = GetPDFProgId(suffix);
@@ -480,6 +481,7 @@ void GetShellIntegrationEntries(
// file association.
for (int i = 0;
UNSAFE_TODO(ShellUtil::kPotentialFileAssociations[i]) != nullptr; i++) {
@@ -478,6 +479,7 @@ void GetShellIntegrationEntries(
const std::wstring html_prog_id(GetBrowserProgId(suffix));
// Associate ordinary files with the HTML Prog ID (e.g., "ChromeHTML").
for (auto association : ShellUtil::kPotentialFileAssociations) {
+ BRAVE_GET_SHELL_INTEGRATION_ENTRIES
entries->push_back(std::make_unique<RegistryEntry>(
capabilities + L"\\FileAssociations",
UNSAFE_TODO(ShellUtil::kPotentialFileAssociations[i]),
@@ -510,6 +512,7 @@ void GetAppExtRegistrationEntries(
capabilities + L"\\FileAssociations", std::wstring(association),
html_prog_id));
@@ -517,6 +519,7 @@ void GetAppExtRegistrationEntries(
std::wstring key_name =
base::StrCat({ShellUtil::kRegClasses, kFilePathSeparator, ext,
kFilePathSeparator, ShellUtil::kRegOpenWithProgids});
patches/chrome-utility-BUILD.gn.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index 708d3db9a2b7dad11d7e1f094cdc4705ed9077db..b87bd1f9df3c4690105558e5978a8a4c2f1d4689 100644
index eaccd0678a3f4cec435807c61943a9324f70c2c6..014b206ca9ff986085ae8ccb7250a59fc7a50151 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -250,6 +250,7 @@ static_library("utility") {
if (enable_on_device_translation) {
deps += [ "//components/services/on_device_translation:on_device_translation_service" ]
deps += [ "//components/on_device_translation/service:on_device_translation_service" ]
}
+ import("//brave/utility/sources.gni") sources += brave_utility_sources deps += brave_utility_deps public_deps += brave_utility_public_deps
}
if (!is_android) {
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch
+9 -9
View File
@@ -1,21 +1,21 @@
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
index ae0964539b36830ec117a8c748e1c893d42f843d..900cddf9b46e8b55f09fac3e8d8ed1113f2561c2 100644
index d335c6e2ea9edc45acd7af8e25d2d356a0063e30..f368f79e242159c31e205ff44e2fb7849fcd8677 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
@@ -82,6 +82,7 @@ public class SiteSettingsCategory {
Type.LOCAL_NETWORK_ACCESS,
Type.WINDOW_MANAGEMENT,
@@ -83,6 +83,7 @@ public class SiteSettingsCategory {
Type.AUTO_PICTURE_IN_PICTURE,
+ Type.AUTOPLAY, Type.BRAVE_GOOGLE_SIGN_IN,
Type.LOCAL_NETWORK,
Type.LOOPBACK_NETWORK,
+ Type.AUTOPLAY, Type.BRAVE_GOOGLE_SIGN_IN
Type.NUM_ENTRIES
})
@Retention(RetentionPolicy.SOURCE)
@@ -128,7 +129,7 @@ public class SiteSettingsCategory {
int AUTO_PICTURE_IN_PICTURE = 37;
@@ -130,7 +131,7 @@ public class SiteSettingsCategory {
int LOOPBACK_NETWORK = 38;
/** Number of handled categories used for calculating array sizes. */
- int NUM_ENTRIES = 38;
+ int AUTOPLAY = 38; int BRAVE_GOOGLE_SIGN_IN = 39; int NUM_ENTRIES = 40;
- int NUM_ENTRIES = 39;
+ int AUTOPLAY = 39; int BRAVE_GOOGLE_SIGN_IN = 40; int NUM_ENTRIES = 41;
}
private final BrowserContextHandle mBrowserContextHandle;
patches/components-content_settings-core-browser-BUILD.gn.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
index 98422cd2565c93f7f2739d2209d2c0c8ff90e77d..81cf5461be0a3ef04a1f913cd84d3f3649b7ec79 100644
index 3c9959812e18ce0be0296382bb095113647fba04..19d58e232628ec87e48d17a7027a72f7572db2e7 100644
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -81,6 +81,7 @@ static_library("browser") {
}
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -87,6 +87,7 @@ static_library("browser") {
# for PageInfoRelatedWebsiteSetsTest tests.
# TODO(crbug.com/40145057): remove deprecated RWS and this include.
public_deps += [ "//components/privacy_sandbox:privacy_sandbox_prefs" ]
+ sources += brave_components_content_settings_core_browser_sources deps += brave_components_content_settings_core_browser_deps
}
patches/components-page_info-page_info.cc.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
index ab3059e214a8226bd9a3e35ffbc09b39063a64f9..60aed113a7b6f605708f9954a30a7ae478be3068 100644
index dc526bc3b0814fe3bd72e3ac91180325ccdf4807..062d027d0d691f9f8130ad5805767f35805320b8 100644
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -1368,6 +1368,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
@@ -1367,6 +1367,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
// via `HasContentSettingChangedViaPageInfo(type)`.
bool PageInfo::ShouldShowPermission(
const PageInfo::PermissionInfo& info) const {
+ BRAVE_PAGE_INFO_SHOULD_SHOW_PERMISSION
// For the Loud Clapper experiment Chrome should display NOTIFICATIONS
// For the Clapper experiment Chrome should display NOTIFICATIONS
// permission while it is being requested.
#if BUILDFLAG(IS_ANDROID)
patches/components-permissions-permission_util.cc.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index 766ad28c66348f79164d8690faffb936bf659884..6cf8ea22dc7beaa501fed427b14464a01873c575 100644
index c02c2a570208165b1e7bdd9d44864b3ecac9cfa4..63350fa704da20ffc4df7e1caf243f97c3027c85 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -115,6 +115,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequests(
@@ -18,8 +18,8 @@ index 766ad28c66348f79164d8690faffb936bf659884..6cf8ea22dc7beaa501fed427b14464a0
}
}
@@ -540,6 +542,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
return ContentSettingsType::LOCAL_NETWORK_ACCESS;
@@ -550,6 +552,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
return ContentSettingsType::LOOPBACK_NETWORK;
case PermissionType::NUM:
break;
+ PERMISSION_UTIL_PERMISSION_TYPE_TO_CONTENT_SETTINGS_TYPE
patches/components-sync-protocol-proto_visitors.h.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
index d8f6024c2042b02dc71ce718970ecd2d030da59c..d9379064a8b6e933819ab12321570167ccb8982e 100644
index 22c7cc893798adb37551dee7de755be8f87342cf..f745ec681ea4de576c0b0b68a375ed8abb757f5c 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -641,6 +641,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
@@ -10,8 +10,8 @@ index d8f6024c2042b02dc71ce718970ecd2d030da59c..d9379064a8b6e933819ab12321570167
VISIT(sharing_fields);
VISIT(invalidation_fields);
VISIT(paask_fields);
@@ -663,6 +664,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
VISIT(auto_sign_out_last_signin_timestamp_windows_epoch_micros);
@@ -664,6 +665,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
VISIT(desktop_to_ios_promo_receiving_enabled);
}
+BRAVE_VISIT_PROTO_FIELDS_BRAVE_SPECIFIC_FIELD
patches/content-browser-devtools-protocol_config.json.patch
+7 -7
View File
@@ -1,13 +1,13 @@
diff --git a/content/browser/devtools/protocol_config.json b/content/browser/devtools/protocol_config.json
index b1e7f9e855483c4fcf88e6376ec30b5b1293eabd..b4e345440059f3542695927e2c37e2b5f7021eb7 100644
index 8f15b6be44b7a35ee18fe51500bf0624358edc30..7bc52a960e2e4328daec388ec3d793f06a1cc946 100644
--- a/content/browser/devtools/protocol_config.json
+++ b/content/browser/devtools/protocol_config.json
@@ -130,7 +130,7 @@
"enableReportingApi",
"setCookieControls"
@@ -133,7 +133,7 @@
"setCookieControls",
"configureDurableMessages"
],
- "include_events": ["requestWillBeSent", "responseReceived", "loadingFinished", "loadingFailed", "requestIntercepted", "signedExchangeReceived", "requestWillBeSentExtraInfo", "responseReceivedExtraInfo", "responseReceivedEarlyHints", "trustTokenOperationDone", "policyUpdated", "reportingApiReportAdded", "reportingApiReportUpdated", "reportingApiEndpointsChangedForOrigin"],
+ "include_events": ["requestAdblockInfoReceived", "requestWillBeSent", "responseReceived", "loadingFinished", "loadingFailed", "requestIntercepted", "signedExchangeReceived", "requestWillBeSentExtraInfo", "responseReceivedExtraInfo", "responseReceivedEarlyHints", "trustTokenOperationDone", "policyUpdated", "reportingApiReportAdded", "reportingApiReportUpdated", "reportingApiEndpointsChangedForOrigin"],
- "include_events": ["requestWillBeSent", "responseReceived", "loadingFinished", "loadingFailed", "requestIntercepted", "signedExchangeReceived", "requestWillBeSentExtraInfo", "responseReceivedExtraInfo", "responseReceivedEarlyHints", "trustTokenOperationDone", "policyUpdated", "reportingApiReportAdded", "reportingApiReportUpdated", "reportingApiEndpointsChangedForOrigin", "deviceBoundSessionsAdded", "deviceBoundSessionEventOccurred"],
+ "include_events": ["requestAdblockInfoReceived", "requestWillBeSent", "responseReceived", "loadingFinished", "loadingFailed", "requestIntercepted", "signedExchangeReceived", "requestWillBeSentExtraInfo", "responseReceivedExtraInfo", "responseReceivedEarlyHints", "trustTokenOperationDone", "policyUpdated", "reportingApiReportAdded", "reportingApiReportUpdated", "reportingApiEndpointsChangedForOrigin", "deviceBoundSessionsAdded", "deviceBoundSessionEventOccurred"],
"async": [
"configureDurableMessages",
"clearBrowserCookies",
"clearBrowserCache",
patches/ios-chrome-browser-flags-BUILD.gn.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn
index 29321394f4cf73e286254e25af960bdba7a193aa..50f464bd07e22a8b2997b05cb920ceb0cd982413 100644
index b3e3ccd48cd5798047cf160025d3dd9898e10849..589e2b0868745254383db49f7e6e866f2b103576 100644
--- a/ios/chrome/browser/flags/BUILD.gn
+++ b/ios/chrome/browser/flags/BUILD.gn
@@ -125,6 +125,7 @@ source_set("flags") {
if (ios_enable_screen_time) {
deps += [ "//ios/chrome/browser/screen_time/model:feature_flags" ]
}
@@ -118,6 +118,7 @@ source_set("flags") {
"//ios/web/common:web_view_creation_util",
"//ios/web/public",
]
+ import("//brave/ios/browser/flags/sources.gni") deps += brave_flags_deps
}
patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch
+8 -8
View File
@@ -1,19 +1,19 @@
diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
index 661a6389686a4edfbaa06c9b4b940a6c4606475c..32554ef95f549693e11e1302d62e4b070102d4f5 100644
index f53df3a733192f01d0edb7692680892921800480..b74c2d41c6e266a2a3a1bdd5e06e43c18561eb18 100644
--- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
@@ -698,6 +698,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -647,6 +647,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
// Deprecated 09/2025.
registry->RegisterBooleanPref(prefs::kBottomOmnibox, false);
// Deprecated 01/2026.
registry->RegisterListPref(kMagicStackSafetyCheckNotificationsShown);
+ BRAVE_REGISTER_LOCAL_STATE_PREFS
}
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1174,6 +1175,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Deprecated 11/2025.
registry->RegisterListPref(kReaderModeRecentlyUsedTimestampsPref);
@@ -1118,6 +1119,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Deprecated 12/2025.
registry->RegisterStringPref(kAutofillStatesDataDir, std::string());
registry->RegisterBooleanPref(prefs::kIosMiniMapShowNativeMap, true);
+ BRAVE_REGISTER_BROWSER_STATE_PREFS
}
patches/third_party-blink-common-permissions-permission_utils.cc.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc
index 4dd8b8d4498cbe00b5739f620037ebe6915b6033..03d9e25008d1eb355a0630e50b897d3fb9ed6136 100644
index cd412d234864659c18ef09aecf4290e0b2f0cfb2..1011633f29521e6e75ba4ad686ecdb12f083de51 100644
--- a/third_party/blink/common/permissions/permission_utils.cc
+++ b/third_party/blink/common/permissions/permission_utils.cc
@@ -28,6 +28,7 @@ mojom::PermissionStatus ToPermissionStatus(const std::string& status) {
@@ -9,12 +9,12 @@ index 4dd8b8d4498cbe00b5739f620037ebe6915b6033..03d9e25008d1eb355a0630e50b897d3f
+ PERMISSION_UTIL_GET_PERMISSION_STRING
case PermissionType::GEOLOCATION:
return "Geolocation";
case PermissionType::NOTIFICATIONS:
@@ -250,6 +251,7 @@ std::optional<PermissionType> PermissionDescriptorInfoToPermissionType(
case PermissionType::GEOLOCATION_APPROXIMATE:
@@ -263,6 +264,7 @@ std::optional<PermissionType> PermissionDescriptorInfoToPermissionType(
bool clipboard_has_user_gesture,
bool fullscreen_allow_without_user_gesture) {
switch (name) {
+ BRAVE_PERMISSION_UTIL_PERMISSION_DESCRIPTOR_INFO_TO_PERMISSION_TYPE
case PermissionName::GEOLOCATION:
return PermissionType::GEOLOCATION;
case PermissionName::NOTIFICATIONS:
case PermissionName::GEOLOCATION_APPROXIMATE:
patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc
index 896191642fc316998e512ffe7cafdd6ebac5a902..dce9ed2686904fdf047207c0161144a25503b281 100644
index d5ca73aa932888e56ea68e94df3af5bc0b1af6d4..247b7cf483bf519743d0f5220cfc9d1e2df71906 100644
--- a/third_party/blink/renderer/core/frame/cached_permission_status.cc
+++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc
@@ -15,7 +15,6 @@ using mojom::blink::PermissionDescriptorPtr;
@@ -9,8 +9,8 @@ index 896191642fc316998e512ffe7cafdd6ebac5a902..dce9ed2686904fdf047207c0161144a2
-using mojom::blink::PermissionStatus;
// static
CachedPermissionStatus* CachedPermissionStatus::From(
@@ -48,7 +47,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const {
const char CachedPermissionStatus::kSupplementName[] = "CachedPermissionStatus";
@@ -51,7 +50,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const {
void CachedPermissionStatus::RegisterClient(
Client* client,
const Vector<PermissionDescriptorPtr>& permissions) {
patches/third_party-libaddressinput-chromium-chrome_metadata_source.cc.patch
+4 -4
View File
@@ -1,13 +1,13 @@
diff --git a/third_party/libaddressinput/chromium/chrome_metadata_source.cc b/third_party/libaddressinput/chromium/chrome_metadata_source.cc
index 5054de5bd4e403fcbaa8cdd6abae42a4f0e89692..837dbf87822842c54809589c08be3b7ef5c187c3 100644
index 735634c701ee3dc9f022f02b90adfbc38b5e0334..5c4e5e784c40e9166fa6c6ff1f1941761972dde2 100644
--- a/third_party/libaddressinput/chromium/chrome_metadata_source.cc
+++ b/third_party/libaddressinput/chromium/chrome_metadata_source.cc
@@ -57,7 +57,7 @@ ChromeMetadataSource::Request::Request(
@@ -60,7 +60,7 @@ ChromeMetadataSource::Request::Request(
void ChromeMetadataSource::Download(const std::string& key,
const Callback& downloaded) {
GURL resource(validation_data_url_ + key);
- if (!resource.SchemeIsCryptographic()) {
+ if (1) { // feature disabled in Brave
downloaded(false, key, NULL);
+ if (/*!resource.SchemeIsCryptographic()*/ true) { // bailing out early, feature disabled in Brave
downloaded(false, key, std::nullopt);
return;
}
patches/third_party-rust-serde_json_lenient-v0_2-wrapper-visitor.rs.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/rust/serde_json_lenient/v0_2/wrapper/visitor.rs b/third_party/rust/serde_json_lenient/v0_2/wrapper/visitor.rs
index c8f0c444c21fa229d9b87bcb26fb8390d6a025ac..9ee3500a8ea92833253b9c1decd8a5d96785a8ec 100644
index 6633db977ecfd00d10034bb0db7ebd41162e1aa1..641c26db3b944f681afb96866c9fb05347966ef0 100644
--- a/third_party/rust/serde_json_lenient/v0_2/wrapper/visitor.rs
+++ b/third_party/rust/serde_json_lenient/v0_2/wrapper/visitor.rs
@@ -3,6 +3,7 @@
@@ -64,10 +64,10 @@ index c8f0c444c21fa229d9b87bcb26fb8390d6a025ac..9ee3500a8ea92833253b9c1decd8a5d9
}
Ok(())
@@ -193,6 +205,7 @@ impl<'de> Visitor<'de> for ValueVisitor<'_, '_> {
while let Some(_) = access.next_element_seed(ValueVisitor {
while access.next_element_seed(ValueVisitor {
aggregate: DeserializationTarget::List { ctx: inner_ctx.as_mut() },
recursion_depth_check: self.recursion_depth_check.recurse()?,
+ allow_64bit_numbers: self.allow_64bit_numbers,
})? {}
})?.is_some() {}
Ok(())
}
patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/metadata/permissions/histograms.xml b/tools/metrics/histograms/metadata/permissions/histograms.xml
index 5bf514e5c9baddf49ca8a23dc38226b9bc28a7b0..8c1b038a59655e4f3b33e8a4ab5da97b9fa89b26 100644
index f276d99e94593c5a1eed7c39ca497bb64a3b49d6..6d004a80adcd49d2a26f826cc2d5f7951a51ff2b 100644
--- a/tools/metrics/histograms/metadata/permissions/histograms.xml
+++ b/tools/metrics/histograms/metadata/permissions/histograms.xml
@@ -51,6 +51,7 @@ chromium-metrics-reviews@google.com.
@@ -53,6 +53,7 @@ chromium-metrics-reviews@google.com.
<variant name="PointerLock"/>
<variant name="ProtectedMedia"/>
<variant name="Quota"/>
@@ -10,11 +10,11 @@ index 5bf514e5c9baddf49ca8a23dc38226b9bc28a7b0..8c1b038a59655e4f3b33e8a4ab5da97b
<variant name="RegisterProtocolHandler"/>
<variant name="SecurityKeyAttestation"/>
<variant name="StorageAccess"/>
@@ -127,6 +128,7 @@ chromium-metrics-reviews@google.com.
@@ -152,6 +153,7 @@ chromium-metrics-reviews@google.com.
<variant name=".PointerLock" summary="Pointer lock permission"/>
<variant name=".ProtectedMedia" summary="Protected media permission"/>
<variant name=".PushMessaging" summary="Push messaging permission"/>
<variant name=".Quota" summary="Quota permission"/>
+ <variant name=".Widevine" summary="Widevine permission"/>
<variant name=".RegisterProtocolHandler"
summary="registerProtocolHandler permission"/>
<variant name=".SecurityKeyAttestation" summary="Security Key attestation"/>
<variant name=".SmartCard" summary="Smart card connection permission"/>
patches/tools-web_dev_style-eslint.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/web_dev_style/eslint.py b/tools/web_dev_style/eslint.py
index 66479d90e154ccbe568e3dae4727f79f47551db8..fdf3143192af670263958746b2f81ec160fa3070 100755
index 7b2eb6695cb4086c22529ec2d17ec6c0d49d3d88..3ddf70460f1588c0023ebc850c72d017247a8d00 100755
--- a/tools/web_dev_style/eslint.py
+++ b/tools/web_dev_style/eslint.py
@@ -32,6 +32,7 @@ def Run(os_path=None, args=None):
@@ -33,6 +33,7 @@ def Run(os_path=None, args=None):
] + args)