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

Conflict-resolved patches from Chromium 130.0.6723.44 to Chromium 131.0.6776.1.

Browse Source
This commit is contained in:
Claudio DeSouza
2024-10-24 12:14:26 +01:00
parent 9d88a30278
commit a62a16d211
34 changed files with 132 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-BUILD.gn.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 9247e9b3f4c92e6f573898049bca784cccb4b19c..e88caf45e09e864d42be27352eff26d34562d117 100644
index aa1654d428420e99bdce3abf3140f764d73e7c48..cbe7fe8fa1f99202d4904ee3d9ccb6355312146b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4407,6 +4407,7 @@ if (is_android) {
@@ -4417,6 +4417,7 @@ if (is_android) {
"android/java/src/org/chromium/base/ValueChangedCallback.java",
"android/java/src/org/chromium/base/WrappedClassLoader.java",
]
@@ -10,15 +10,15 @@ index 9247e9b3f4c92e6f573898049bca784cccb4b19c..e88caf45e09e864d42be27352eff26d3
if (use_clang_profiling) {
sources += [
@@ -4871,6 +4872,7 @@ if (is_android) {
@@ -4882,6 +4883,7 @@ if (is_android) {
"android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
"android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
]
+ sources += brave_base_shared_preferences_java_sources
}
android_library("base_cached_flags_java") {
@@ -4896,6 +4898,7 @@ if (is_android) {
# Most cached_flags code is in components/cached_flags. These classes are
@@ -4900,6 +4902,7 @@ if (is_android) {
"android/java/src/org/chromium/base/cached_flags/ValuesOverridden.java",
"android/java/src/org/chromium/base/cached_flags/ValuesReturned.java",
]
patches/base-allocator-partition_allocator-partition_alloc.gni.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/base/allocator/partition_allocator/partition_alloc.gni b/base/allocator/partition_allocator/partition_alloc.gni
index 2b589ddd153214e237c1028f6be736351754a6f0..f320b815d1a500dffc299471140a21ff2e5d03c7 100644
--- a/base/allocator/partition_allocator/partition_alloc.gni
+++ b/base/allocator/partition_allocator/partition_alloc.gni
@@ -284,7 +284,9 @@ stack_scan_supported =
# - has_memory_tagging
if (!use_partition_alloc ||
(defined(toolchain_allows_use_partition_alloc_as_malloc) &&
- !toolchain_allows_use_partition_alloc_as_malloc)) {
+ !toolchain_allows_use_partition_alloc_as_malloc) ||
+ (defined(toolchain_for_rust_host_build_tools) &&
+ toolchain_for_rust_host_build_tools)) {
use_partition_alloc_as_malloc = false
glue_core_pools = false
enable_backup_ref_ptr_support = false
patches/base-numerics-checked_math_impl.h.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
index e619956a16e0b5ed2b1ecadeeb97deb6d4df4b94..027c46ed08fac68e0cf715a172ba736e3bc9101f 100644
--- a/base/numerics/checked_math_impl.h
+++ b/base/numerics/checked_math_impl.h
@@ -189,7 +189,7 @@ struct CheckedMulOp<T, U> {
Promotion presult = {};
bool is_valid = true;
- if (CheckedMulFastOp<Promotion, Promotion>::is_supported) {
+ if constexpr (CheckedMulFastOp<Promotion, Promotion>::is_supported) {
// The fast op may be available with the promoted type.
// The casts here are safe because of the "value in range" conditional
// above.
patches/chrome-android-BUILD.gn.patch
+7 -7
View File
@@ -2,7 +2,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b604c6e6db9 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -194,6 +194,7 @@ if (current_toolchain == default_toolchain) {
@@ -192,6 +192,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -10,7 +10,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
}
android_resources("chrome_app_java_resources") {
@@ -282,6 +283,7 @@ if (current_toolchain == default_toolchain) {
@@ -281,6 +282,7 @@ if (current_toolchain == default_toolchain) {
} else {
deps += [ "//components/plus_addresses/android:java_resources" ]
}
@@ -18,7 +18,7 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
}
android_resources("java_overlay_resources") {
@@ -774,6 +776,7 @@ if (current_toolchain == default_toolchain) {
@@ -743,6 +745,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
@@ -26,16 +26,16 @@ index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..cc4aad1e81b8d92eede35342506b5b60
srcjar_deps = [
":chrome_android_java_enums_srcjar",
@@ -791,6 +794,7 @@ if (current_toolchain == default_toolchain) {
@@ -760,6 +763,7 @@ if (current_toolchain == default_toolchain) {
"//components/sharing_message:sharing_send_message_result_generated_enum",
"//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
]
+ srcjar_deps += brave_chrome_java_srcjar_deps
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -923,6 +927,7 @@ if (current_toolchain == default_toolchain) {
"//components/saved_tab_groups:java",
sources = chrome_java_sources
@@ -890,6 +894,7 @@ if (current_toolchain == default_toolchain) {
"//components/saved_tab_groups/public:conversion_utils_java",
"//components/segmentation_platform/internal:internal_java",
]
+ deps += brave_chrome_all_java_deps
patches/chrome-android-chrome_java_sources.gni.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index c37da0e0f8b3e8549106ded5ad22f2c45663d690..aabd7797955889dcec37c47d901140a75bbcefa8 100644
index c9f8dee73517bff0316b640e040fc086440ff463..bfff40a4c17a97d00e00331379a8673a30807f0b 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1215,3 +1215,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
@@ -1217,3 +1217,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
]
+chrome_java_sources -= ["java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java",]
patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
index 0e09dbed0837ec74dd3fef73f3d92555faa7156c..e76992f5ae4e9d92cc94c32ac6fc3efc3f9646ea 100644
index eaffd5888cef7125b1181188a6bf67595186105c..2574e22438c895d9f16705715300a732163d4978 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
@@ -62,7 +62,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils;
@@ -17,6 +17,6 @@ index 0e09dbed0837ec74dd3fef73f3d92555faa7156c..e76992f5ae4e9d92cc94c32ac6fc3efc
// May happen if account is removed from the device while this screen is shown.
- if (signedInAccountName == null) {
+ if (false) {
if (getActivity() != null) getActivity().finish();
finishCurrentSettings();
return;
}
patches/chrome-browser-hub-internal-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/hub/internal/BUILD.gn b/chrome/browser/hub/internal/BUILD.gn
index db11b833b402e7808c2d79d6eb11914e957e937b..534dd276105252f18ab6d1b6abe7666685aaa68e 100644
index 248b2853c853bddcd11b7fa499d093be1f258757..07dd8808809064efc9fd197f512f907cbfa22e83 100644
--- a/chrome/browser/hub/internal/BUILD.gn
+++ b/chrome/browser/hub/internal/BUILD.gn
@@ -43,6 +43,7 @@ android_library("java") {
patches/chrome-browser-resources-extensions-sidebar.html.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/extensions/sidebar.html b/chrome/browser/resources/extensions/sidebar.html
index dbba22d216e5b0ff1acdc5b82eef5289a96a0ca8..21bb60f9e88bcc56a7099574f052fbb4b86bcf2b 100644
index ff74778591b553de60c1125656f1108d70c6d868..bfa71e3cc8ddc6fee2539f87a2f24a3837913922 100644
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -74,6 +74,7 @@ cr-shared-style">
@@ -24,6 +24,7 @@
<cr-ripple></cr-ripple>
</a>
</cr-menu-selector>
@@ -10,8 +10,8 @@ index dbba22d216e5b0ff1acdc5b82eef5289a96a0ca8..21bb60f9e88bcc56a7099574f052fbb4
<div class="separator"></div>
<div class="cr-nav-menu-item" id="moreExtensions">
<cr-icon id="web-store-icon" icon="extensions-icons:web_store">
@@ -83,3 +84,4 @@ cr-shared-style">
inner-h-t-m-l="[[discoverMoreText_]]"></span>
@@ -33,3 +34,4 @@
.innerHTML="${this.computeDiscoverMoreText_()}"></span>
<cr-ripple></cr-ripple>
</div>
+-->
patches/chrome-browser-resources-history-history_item.ts.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts
index 0279d744c9513d40d56a3a7e6f21aee3bd90d90f..585f252a5c8d516ae5eef4368431f088e4ebfc65 100644
index 0349af62bc595150b87232f899b978a6eb4b56a1..f4b115e5819443cf64af6d507b9f90996faaf524 100644
--- a/chrome/browser/resources/history/history_item.ts
+++ b/chrome/browser/resources/history/history_item.ts
@@ -10,6 +10,7 @@ import 'chrome://resources/cr_elements/cr_icons.css.js';
@@ -10,6 +10,7 @@ import 'chrome://resources/cr_elements/cr_icon/cr_icon.js';
import 'chrome://resources/cr_elements/cr_icons.css.js';
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
import 'chrome://resources/js/icon.js';
import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
+import './brave_history_item.js'
import {HistoryResultType} from 'chrome://resources/cr_components/history/constants.js';
patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
index ca19589fbc70408fce8ac69c4690eac95f50f309..0db8f2a862ba92ff3729097a1b62b25f748f4dcb 100644
index ead2033ad6ce1cf4d537d5820e619f3f6556a061..7f8159faa04693c15cbc62ee7395d49373ce1b36 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -24,6 +24,7 @@ import '../settings_shared.css.js';
import '../site_settings/offer_writing_help_page.js';
@@ -23,6 +23,7 @@ import '../settings_page/settings_subpage.js';
import '../settings_shared.css.js';
import '../site_settings/settings_category_default_radio_group.js';
import '../site_settings/smart_card_readers_page.js';
+import './personalization_options.js';
patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
+4 -4
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index a42f9b0e0ed2b752599a93e1c36e42457214a0f6..4e7a5019cf9fada7bff66dead8a0ce857101b4c5 100644
index c89ef3b498e14fa416b6b34bfc203e66baf026d6..6b4e23d31effd28747b8d06a84da1389eb189c4a 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -8,6 +8,7 @@
* security site settings.
@@ -9,6 +9,7 @@
*/
import 'chrome://resources/cr_elements/icons_lit.html.js';
+import '../brave_overrides/config.js'
import 'chrome://resources/cr_elements/icons.html.js';
import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
patches/chrome-browser-tab_ui-android-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/tab_ui/android/BUILD.gn b/chrome/browser/tab_ui/android/BUILD.gn
index f889ad2d2844ce64e15a6268684ecaa478316831..fae2eb47cbc248ed17294dd1aabdb2f1fcaa5664 100644
index 2e13039e87e467c1f3ed394a2ae5fce8d21b8525..1dcb8453c41a6487c25013841855404d928b09b3 100644
--- a/chrome/browser/tab_ui/android/BUILD.gn
+++ b/chrome/browser/tab_ui/android/BUILD.gn
@@ -23,6 +23,7 @@ android_library("java") {
@@ -9,4 +9,4 @@ index f889ad2d2844ce64e15a6268684ecaa478316831..fae2eb47cbc248ed17294dd1aabdb2f1
+ sources += brave_tab_ui_sources
deps = [
":java_resources",
"//base:base_cached_flags_java",
"//base:base_java",
patches/chrome-browser-ui-BUILD.gn.patch
+5 -5
View File
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index bc6e4008f2c5a5aa47406e4ec69b804b356c7383..949fba72967d38a7696692ca73bfc48e25175918 100644
index 1d4df92c6685b8f6a7501cb37a470235df57b507..7dff5f269ff1e7db3e01f5f48dac71d46703d00f 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -758,6 +758,7 @@ static_library("ui") {
# TODO(crbug.com/): It includes //c/b/ui/browser_dialogs.h and //c/b/ui/url_identity.h
"//chrome/browser/ui/file_system_access:impl",
@@ -736,6 +736,7 @@ static_library("ui") {
"//chrome/browser/content_settings:impl",
"//chrome/browser/content_settings:content_settings_util_impl",
]
+ public_deps += [ "//brave/browser/ui" ] allow_circular_includes_from += [ "//brave/browser/ui" ]
if (enable_vr && is_win) {
deps += [ "//chrome/browser/vr:vr_base" ]
@@ -3823,7 +3824,10 @@ static_library("ui") {
@@ -3656,7 +3657,10 @@ static_library("ui") {
]
deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ]
} else {
patches/chrome-browser-ui-views-bubble-webui_bubble_manager.h.patch
+2 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bubble/webui_bubble_manager.h b/chrome/browser/ui/views/bubble/webui_bubble_manager.h
index f62127ba47a2c4e0e1533d11cae9967aee769258..f2c8cf309f491898f340d8f1c1c87b973316375a 100644
index edd7d37a12e182cc663db4e565b8a9edb12e0c70..e90187359fc82f33135212fb627ac07d495076d0 100644
--- a/chrome/browser/ui/views/bubble/webui_bubble_manager.h
+++ b/chrome/browser/ui/views/bubble/webui_bubble_manager.h
@@ -162,10 +162,12 @@ class WebUIBubbleManagerImpl : public WebUIBubbleManager {
@@ -165,9 +165,11 @@ class WebUIBubbleManagerImpl : public WebUIBubbleManager {
private:
// WebUIBubbleManager:
@@ -10,7 +10,6 @@ index f62127ba47a2c4e0e1533d11cae9967aee769258..f2c8cf309f491898f340d8f1c1c87b97
base::WeakPtr<WebUIBubbleDialogView> CreateWebUIBubbleDialog(
const std::optional<gfx::Rect>& anchor,
views::BubbleBorder::Arrow arrow) override;
WebUIContentsWrapper* GetContentsWrapper() override;
+ private:
const raw_ptr<views::View> anchor_view_;
patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch
+5 -5
View File
@@ -1,13 +1,13 @@
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
index 9b41960c2811e32def94cca9eae5c9b60867a4cf..56ea086ab0d3144858ee4199fa24eae2ce50e319 100644
index 90bb8bb69832476d1e0f3a8250195515f9099363..2f5c1a04670e2624c6bcb443b230e35c9c0b2b5e 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
+++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
@@ -55,7 +55,7 @@ class View;
@@ -54,7 +54,7 @@ class View;
// registry's active_entry() then global registry's. These values are reset when
// the side panel is closed and |last_active_global_entry_id_| is used to
// determine what entry is seen when the panel is reopened.
-class SidePanelCoordinator final : public SidePanelRegistryObserver,
+class SidePanelCoordinator : public SidePanelRegistryObserver,
public TabStripModelObserver,
-class SidePanelCoordinator final : public TabStripModelObserver,
+class SidePanelCoordinator : public TabStripModelObserver,
public views::ViewObserver,
public PinnedToolbarActionsModel::Observer,
public SidePanelUI,
patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 577215577d9acfd8c55f4bbf1b32c7d82640cbbe..12627d12001018c0988c644a3386fd0284713892 100644
index 49a6e89aa17f05e21283b86cf493458830aa3c03..b35b9c15fd4bfa0eecf56eaa6f4af6354b2c2dcc 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -475,6 +475,7 @@ void ToolbarView::Init() {
browser_view_, browser_->profile()));
#endif
@@ -471,6 +471,7 @@ void ToolbarView::Init() {
send_tab_to_self_button_ =
container_view_->AddChildView(std::move(send_tab_to_self_button));
+ BRAVE_TOOLBAR_VIEW_INIT
avatar_ = container_view_->AddChildView(
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 a1640e5355f65860ea36178ea8fa863abac3c5bf..eef0bc286afc17c172110c4166267210b863eb3b 100644
index 7d32cdea5784c54c0686f7f1d69cb0c5fa728736..6f908d63475514a5baf46040145ac0f9a3d302cb 100644
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -51,6 +51,7 @@ source_set("configs") {
if (is_chromeos_ash) {
deps += [ "//chrome/browser/ui/webui/ash/config" ]
@@ -55,6 +55,7 @@ source_set("configs") {
"//chromeos/constants",
]
}
+ 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
+8 -8
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 d34354c29d963cded0b9ac480847b00a31391df7..91896187382590c4ae3a69acdf98ffa5d57bd4e3 100644
index 3828b286a5d81062cfc6522704c7f600e08cf519..4f711cf4b2641a8f251801307a538d8fc846d1dd 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -244,6 +244,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
{ContentSettingsType::TOP_LEVEL_TPCD_ORIGIN_TRIAL, nullptr},
{ContentSettingsType::DISPLAY_MEDIA_SYSTEM_AUDIO, nullptr},
@@ -247,6 +247,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
{ContentSettingsType::STORAGE_ACCESS_HEADER_ORIGIN_TRIAL, nullptr},
// TODO(crbug.com/368266658): Implement the UI for Direct Sockets PNA.
{ContentSettingsType::DIRECT_SOCKETS_PRIVATE_NETWORK_ACCESS, nullptr},
+ BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST
};
static_assert(
@@ -486,6 +487,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -508,6 +509,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
@@ -18,7 +18,7 @@ index d34354c29d963cded0b9ac480847b00a31391df7..91896187382590c4ae3a69acdf98ffa5
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`
@@ -500,6 +502,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 d34354c29d963cded0b9ac480847b00a31391df7..91896187382590c4ae3a69acdf98ffa5
for (const auto& entry : kContentSettingsTypeGroupNames) {
if (type == entry.type) {
// Content setting types that aren't represented in the settings UI
@@ -679,6 +682,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
@@ -696,6 +699,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) {
SiteSettingSource ProviderTypeToSiteSettingsSource(
const ProviderType provider_type) {
switch (provider_type) {
@@ -34,7 +34,7 @@ index d34354c29d963cded0b9ac480847b00a31391df7..91896187382590c4ae3a69acdf98ffa5
case ProviderType::kWebuiAllowlistProvider:
return SiteSettingSource::kAllowlist;
case ProviderType::kPolicyProvider:
@@ -705,6 +709,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
@@ -722,6 +726,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource(
std::string ProviderToDefaultSettingSourceString(const ProviderType provider) {
switch (provider) {
patches/chrome-elevation_service-BUILD.gn.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/elevation_service/BUILD.gn b/chrome/elevation_service/BUILD.gn
index 88ed423e737ea90ba93f97da86ec6b55552bf52e..16222646243e034810a17f83faa158bd7602e92f 100644
index f82cf43c78367ee2bb33dbc70ca0f8d31e68fdec..f89ebc52107d6b4a1cda94dfda69e6ac2c7054fd 100644
--- a/chrome/elevation_service/BUILD.gn
+++ b/chrome/elevation_service/BUILD.gn
@@ -11,6 +11,7 @@ import("//testing/test.gni")
@@ -10,11 +10,11 @@ index 88ed423e737ea90ba93f97da86ec6b55552bf52e..16222646243e034810a17f83faa158bd
writes_tlb = true
}
@@ -105,6 +106,7 @@ source_set("lib") {
@@ -80,6 +81,7 @@ source_set("lib") {
"crypt32.lib",
"rpcrt4.lib",
]
+ deps += brave_elevation_service_lib_deps
}
process_version_rc_template("version_resources") {
source_set("service_lib") {
patches/components-browsing_data-core-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn
index 9ca09f512e151ceea7efd92730d6b74592210afc..c5a96268ac4c463cbdfc18ca1ffe1c54016f467f 100644
index 3da3507c5d3ec54f1b4307b3071350423492a232..0c94d05cc13d1bc00f389a497415fe33a94e0cbd 100644
--- a/components/browsing_data/core/BUILD.gn
+++ b/components/browsing_data/core/BUILD.gn
@@ -49,6 +49,7 @@ static_library("core") {
@@ -9,4 +9,4 @@ index 9ca09f512e151ceea7efd92730d6b74592210afc..c5a96268ac4c463cbdfc18ca1ffe1c54
+ import("//brave/components/browsing_data/core/sources.gni") deps += brave_components_browsing_data_core_deps
}
if (is_android) {
source_set("cookie_or_cache_deletion_choice") {
patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+3 -3
View File
@@ -1,10 +1,10 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index 6d1fed50def001bfca82fbd01adfcffc8d0ac58e..1a9f90df672276f906a05e315655ff1275d29f8d 100644
index d4f358eccebafc69313d1544e1a09c822f09219a..554f53e9d9da6fc8dd41c23f71e0ae47d6c89bd2 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -836,6 +836,7 @@ void ContentSettingsRegistry::Init() {
@@ -849,6 +849,7 @@ void ContentSettingsRegistry::Init() {
WebsiteSettingsRegistry::DESKTOP,
ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+ BRAVE_INIT
}
patches/components-search_engines-BUILD.gn.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
index 6a9a70a7c4d2d41bf576854c5be4f1cc61c3377f..4c531a189e851c018a50a8209cd835647e84d45a 100644
index b38a5d88fd1f25d889395abbe8d712cfe69bd519..425141cffafbbfb72f989a254cc947558471c158 100644
--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
@@ -265,6 +265,7 @@ json_to_struct("prepopulated_engines") {
schema_file = "prepopulated_engines_schema.json"
namespace = "TemplateURLPrepopulateData"
deps = [ ":search_engine_type" ]
@@ -271,6 +271,7 @@ json_to_struct("prepopulated_engines") {
":search_engine_type",
"//base",
]
+ additional_sources = brave_components_search_engines_sources
}
patches/components-search_engines-default_search_manager.cc.patch
+4 -4
View File
@@ -1,12 +1,12 @@
diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
index 6b04809f0ce444161bd5ee16cd0c735a0a4176ff..6740fd176dc3c78c7cf1f7579030f82f53e1cc14 100644
index a012a0693197274de6ca7281909d412a8403cfc3..0730bf5f71969d7c4ffaae1a12c346fa81e5dec2 100644
--- a/components/search_engines/default_search_manager.cc
+++ b/components/search_engines/default_search_manager.cc
@@ -425,6 +425,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
@@ -304,6 +304,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
// Check if default search preference is overriden by extension.
if (pref->IsExtensionControlled()) {
extension_default_search_ = std::move(turl_data);
+ LOADDEFAULTSEARCHENGINEFROMPREFS_BRAVE
} else {
prefs_default_search_ = std::move(turl_data);
MergePrefsDataWithPrepopulated();
prefs_default_search_.SetAndReconcile(std::move(turl_data));
}
patches/components-search_engines-prepopulated_engines.json.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 40a13e733cbcb351898eefb64242a3a8187d198f..a897824b6fc01a0a937d603e9a9e86664a4f37ec 100644
index 46ca9d2c2f4325d7b65b3c144214aee1c45b19b5..ee3109a6f2a7f3b7bb8a1dbe0f7b5b6dafe955c6 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -116,23 +116,6 @@
@@ -52,6 +52,6 @@ index 40a13e733cbcb351898eefb64242a3a8187d198f..a897824b6fc01a0a937d603e9a9e8666
- ]
- },
-
"seznam_cz": {
"seznam": {
"name": "Seznam.cz",
"keyword": "seznam.cz",
"keyword": "seznam",
patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/ios/chrome/browser/shared/model/prefs/BUILD.gn b/ios/chrome/browser/shared/model/prefs/BUILD.gn
index f54fced81bb556a0a602afc66cd977096f453139..5eb8ce2c16f20ceba028d894ef98c31266835cf6 100644
index b2ff7746d955beda547f642852865f746f7bb7fd..ef4aec46519cadbb3b2839f33fed25d29e8d9508 100644
--- a/ios/chrome/browser/shared/model/prefs/BUILD.gn
+++ b/ios/chrome/browser/shared/model/prefs/BUILD.gn
@@ -128,6 +128,7 @@ source_set("browser_prefs") {
"//ios/web/common:features",
"//ui/base",
]
@@ -138,6 +138,7 @@ source_set("browser_prefs") {
if (build_with_internal_optimization_guide) {
deps += [ "//components/optimization_guide/core:features" ]
}
+ import("//brave/chromium_src/ios/chrome/browser/shared/model/prefs/sources.gni") deps += brave_browser_prefs_deps
}
patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch
+10 -10
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 a1ea0b6a8d246371d1931258bd0d1d9151956091..0afd8bfb914fabb51970c4eb254bf355f710a9fa 100644
index 9aafc20ca26d84604047661f0a5d0ee56363bec3..8da6a690fd25727e5a048464777c6db8779c3ee1 100644
--- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
@@ -712,6 +712,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
// List pref that stores the positions of the Safety Check module (with
// notifications opt-in) within the Magic Stack.
registry->RegisterListPref(prefs::kMagicStackSafetyCheckNotificationsShown);
@@ -778,6 +778,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kAddressBarSettingsNewBadgeShownCount,
0);
+ BRAVE_REGISTER_LOCAL_STATE_PREFS
}
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1053,6 +1054,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterInt64Pref(kNtpShownBookmarksFolder, 3);
registry->RegisterDictionaryPref(prefs::kIosPreRestoreAccountInfo);
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1126,6 +1127,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterStringPref(
send_tab_to_self::prefs::kIOSSendTabToSelfLastReceivedTabURLPref,
std::string());
+ BRAVE_REGISTER_BROWSER_STATE_PREFS
}
patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch
+5 -5
View File
@@ -1,13 +1,13 @@
diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm
index 85abb6a5525c550fdd27ea3edeba75d50807b62a..9cbb72fbcb7238c0e18ca082ad72f7f75d598372 100644
index 95a9ef6fe58956e8b09bbf3c42a40da5cb9fceeb..d9571feeaad100399801eef256225e09b3effcb5 100644
--- a/ios/chrome/browser/sync/model/sync_service_factory.mm
+++ b/ios/chrome/browser/sync/model/sync_service_factory.mm
@@ -199,7 +199,7 @@ std::unique_ptr<KeyedService> BuildSyncService(web::BrowserState* context) {
init_params.debug_identifier = browser_state->GetProfileName();
@@ -187,7 +187,7 @@ std::unique_ptr<KeyedService> BuildSyncService(web::BrowserState* context) {
init_params.debug_identifier = profile->GetProfileName();
auto sync_service =
- std::make_unique<syncer::SyncServiceImpl>(std::move(init_params));
+ BRAVE_BUILD_SERVICE_INSTANCE_FOR
sync_service->Initialize(
CreateControllers(browser_state, sync_service.get()));
sync_service->Initialize(CreateControllers(profile, sync_service.get()));
// TODO(crbug.com/40250371): Remove the workaround below once
patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
index afe985fdadc4741829600838c74a503dddb0c687..c5d78cf378522176f96c32fdb1ca955cb2068d6d 100644
index 8c0bbfc878397c137039f27d571b4ad34f54a358..96cadfd91f86c8c7c9762dff0049cea9dc012a2a 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -1161,6 +1161,7 @@ void MediaDevices::DevicesEnumerated(
@@ -1174,6 +1174,7 @@ void MediaDevices::DevicesEnumerated(
}
}
+ BRAVE_MEDIA_DEVICES_DEVICES_ENUMERATED
RecordEnumeratedDevices(result_tracker->GetScriptState(), media_devices);
result_tracker->Resolve(media_devices);
}
tracer->End();
patches/third_party-rust-anyhow-v1-BUILD.gn.patch
+2 -2
View File
@@ -1,10 +1,10 @@
diff --git a/third_party/rust/anyhow/v1/BUILD.gn b/third_party/rust/anyhow/v1/BUILD.gn
index db07bb9536cf2497a28c32d61eb060e48699afa7..6562a086351b70f09b8907ae4b8fad23abedd99e 100644
index e8926dc641e7ac8af137a66c0cff04473768406b..448f21503e8056c8d3ea144b74aeba01d6eb5382 100644
--- a/third_party/rust/anyhow/v1/BUILD.gn
+++ b/third_party/rust/anyhow/v1/BUILD.gn
@@ -48,5 +48,4 @@ cargo_crate("lib") {
build_sources =
[ "//third_party/rust/chromium_crates_io/vendor/anyhow-1.0.87/build.rs" ]
[ "//third_party/rust/chromium_crates_io/vendor/anyhow-1.0.89/build.rs" ]
- testonly = true
}
patches/third_party-rust-syn-v2-BUILD.gn.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/third_party/rust/syn/v2/BUILD.gn b/third_party/rust/syn/v2/BUILD.gn
index 8e224876385a12f32de94419476926c573589532..2af412c861019760ed49a0ef10422da5fcb3e7b1 100644
index 921e3b085aaa57c9b5fa862bcfca4a15afeaac22..9d0340cd746d450415af3442aa7d21f6b8207a17 100644
--- a/third_party/rust/syn/v2/BUILD.gn
+++ b/third_party/rust/syn/v2/BUILD.gn
@@ -98,4 +98,5 @@ cargo_crate("lib") {
"printing",
"proc-macro",
@@ -100,4 +100,5 @@ cargo_crate("lib") {
"visit",
"visit-mut",
]
+ features += [ "extra-traits", "visit", "visit-mut" ]
}
patches/tools-gritsettings-resource_ids.spec.patch
+9 -14
View File
@@ -1,5 +1,5 @@
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index ee2a113e2b77873b18d60deee0a373ea335bf149..90be8efa823833d4a1177deea21abf234f0b60f2 100644
index 38cf9d8fd803f47c57d5491648cb6ae445c1c380..b80ffaec6ee1d630168b6e3ccc93608e475f0024 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -38,6 +38,9 @@
@@ -12,31 +12,26 @@ index ee2a113e2b77873b18d60deee0a373ea335bf149..90be8efa823833d4a1177deea21abf23
"chrome/app/google_chrome_strings.grd": {
"messages": [800],
},
@@ -296,11 +299,11 @@
"includes": [3280],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/extensions/resources.grd": {
- "META": {"sizes": {"includes": [90],}},
+ "META": {"sizes": {"includes": [91],}},
"includes": [3300],
@@ -409,7 +412,7 @@
"includes": [4020],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/resources.grd": {
- "META": {"sizes": {"includes": [40]}},
+ "META": {"sizes": {"includes": [46]}},
"includes": [3320],
"includes": [4040],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/identity_internals/resources.grd": {
@@ -438,7 +441,7 @@
"includes": [4020],
@@ -553,7 +556,7 @@
"includes": [4720],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/resources.grd": {
- "META": {"sizes": {"includes": [500],}},
+ "META": {"sizes": {"includes": [650],}},
"includes": [4040],
"includes": [4740],
},
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings_shared/resources.grd": {
@@ -1015,6 +1018,9 @@
"components/components_chromium_strings.grd": {
@@ -923,6 +926,9 @@
# Big alignment at start of section.
"messages": [7020],
},
+ "components/components_brave_strings.grd": {
patches/ui-webui-resources-cr_elements-BUILD.gn.patch
+8 -8
View File
@@ -1,12 +1,12 @@
diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn
index a2480aec8aa60f1965700cc09de3278ffaab0342..fd99d6ed01d982860e1fca93a0a13fd928b2dbfc 100644
index aaae8e16f2c2b79e3a05bc5d78077af95e836f32..fecf0b00abbc38db6ea2885644ef603f55c1cead 100644
--- a/ui/webui/resources/cr_elements/BUILD.gn
+++ b/ui/webui/resources/cr_elements/BUILD.gn
@@ -223,6 +223,7 @@ build_webui("build") {
ts_composite = true
ts_deps = [ "../js:build_ts" ]
if (include_polymer) {
@@ -233,6 +233,7 @@ build_webui("build") {
"//third_party/lit/v3_0:build_ts",
]
if (!is_android && !is_ios) {
+ ts_deps += ["//brave/ui/webui/resources:build_ts"]
ts_deps += [
"//third_party/lit/v3_0:build_ts",
"//third_party/polymer/v3_0:library",
ts_deps += [ "//third_party/polymer/v3_0:library" ]
}
ts_definitions = [
patches/ui-webui-resources-cr_elements-cr_radio_button-cr_radio_button_style.css.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_style.css b/ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_style.css
index 26be0eb63c6710da71edffb9f7a5c796b321d72a..113aaf9463ffe59fbace67dff252c53f6fc9c979 100644
index 09d8d3aa5c34684370deeff9e63c20d97c56d571..29803457e85eb2d5e4566ef48da244eb2d39699f 100644
--- a/ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_style.css
+++ b/ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_style.css
@@ -7,6 +7,8 @@
@@ -10,4 +10,4 @@ index 26be0eb63c6710da71edffb9f7a5c796b321d72a..113aaf9463ffe59fbace67dff252c53f
+ * #include=br-shared-style
* #css_wrapper_metadata_end */
/* Purposefully empty since this style is generated at build time from the
patches/ui-webui-resources-cr_elements-cr_shared_style.css.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/ui/webui/resources/cr_elements/cr_shared_style.css b/ui/webui/resources/cr_elements/cr_shared_style.css
index eefaf6d369fb2a268045cfd33973a8cced5f56cb..97e8dddd89de1d7340f306931692e377977b8951 100644
index f1b712b919235c97f138137fd0a140b49c793606..6316dfbe43467c0da4b0df5636f2889f9e2d9b9f 100644
--- a/ui/webui/resources/cr_elements/cr_shared_style.css
+++ b/ui/webui/resources/cr_elements/cr_shared_style.css
@@ -8,7 +8,8 @@
@@ -11,4 +11,4 @@ index eefaf6d369fb2a268045cfd33973a8cced5f56cb..97e8dddd89de1d7340f306931692e377
+ * #include=cr-hidden-style br-shared-style cr-icons
* #css_wrapper_metadata_end */
[actionable] {
/* Purposefully empty since this style is generated at build time from the