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

Conflict-resolved patches from Chromium Chromium 96.0.4655.5 to Chromium 96.0.4664.9.

Browse Source
This commit is contained in:
Mario Sanchez Prada
2021-11-02 12:38:04 -04:00
committed by Max Karolinskiy
parent 9fc84d23f6
commit 1fd42a1767
9 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-VERSION.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 4e5d93f12f4ac6889de75e75293ad5222f5f6315..1d8a0a7a351728383b0e29c8290041994000c6ec 100644
index c98831883f43c13cd1f037dafcdfdb68f44cd7c1..7dc58795f618463f8f3a49fbe65802d7295d3f84 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=96
-MINOR=0
-BUILD=4655
-PATCH=5
-BUILD=4664
-PATCH=9
+MINOR=1
+BUILD=33
+PATCH=52
patches/chrome-android-BUILD.gn.patch
-1
View File
@@ -14,7 +14,6 @@ index d74a53ceef764935f70df7867402bba3815bfc08..5d44af63f9691911593345069d15123b
]
deps += feed_deps
deps += web_feed_deps
+ deps += brave_chrome_java_deps
srcjar_deps = [
patches/chrome-browser-profiles-bookmark_model_loaded_observer.h.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.h b/chrome/browser/profiles/bookmark_model_loaded_observer.h
index b4ef0d2aa9e393ace55f65f7aa92153e8dd6069d..7034645e46bf9a0f62173fd7db1b60198ad0f8fb 100644
index bb0fffa6e8b3d75f748d1d550312cf0d8d0c63ce..7b1fcd00f0566ec8a48603c78e2294381db1e5ef 100644
--- a/chrome/browser/profiles/bookmark_model_loaded_observer.h
+++ b/chrome/browser/profiles/bookmark_model_loaded_observer.h
@@ -16,6 +16,7 @@ class BookmarkModelLoadedObserver
public:
explicit BookmarkModelLoadedObserver(Profile* profile);
@@ -20,6 +20,7 @@ class BookmarkModelLoadedObserver
BookmarkModelLoadedObserver& operator=(const BookmarkModelLoadedObserver&) =
delete;
+ BRAVE_BOOKMARK_MODEL_LOADED_OBSERVER_H_
private:
patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 19e8ebebce843516e2e193a7e600a38ee447512d..4e6de49767f434da0f4c123784ddec28647b4b07 100644
index 39b9a43fc681396b565f4cc098cfc0a02662ac8a..9272dae6a42436f07a37d2ba2956eabc3b13f035 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -35,6 +35,7 @@
@@ -7,10 +7,10 @@ index 19e8ebebce843516e2e193a7e600a38ee447512d..4e6de49767f434da0f4c123784ddec28
focus-config="[[focusConfig_]]">
<div route-path="default">
+ <settings-personalization-options prefs="{{prefs}}"></settings-personalization-options>
<template is="dom-if" if="[[enablePrivacyReview_]]">
<cr-link-row id="privacyReviewLinkRow"
start-icon="settings20:safety-check"
@@ -155,6 +156,7 @@
<cr-link-row id="clearBrowsingData"
start-icon="cr:delete"
label="$i18n{clearBrowsingData}"
@@ -154,6 +155,7 @@
</category-setting-exceptions>
</settings-subpage>
</template>
@@ -18,7 +18,7 @@ index 19e8ebebce843516e2e193a7e600a38ee447512d..4e6de49767f434da0f4c123784ddec28
<template is="dom-if" route-path="/content/backgroundSync" no-search>
<settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
search-label="$i18n{siteSettingsAllSitesSearch}"
@@ -182,6 +184,7 @@
@@ -181,6 +183,7 @@
</category-setting-exceptions>
</settings-subpage>
</template>
patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
+4 -4
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 9476569e6059efb6bfaa603fd2b03972ef1d6d06..1f695848482418ae89e6e0132a56dffa625e770d 100644
index c2d1b9fe9bcd002f636abd30238399a5d37f3445..1ac0e7723f28110954d5dd3943659ddd41bf8520 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -322,6 +322,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile,
source->AddString(kLoadTimeClassesKey, GetLoadTimeClasses(in_dev_mode));
@@ -334,6 +334,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile,
kExtensionsMenuAccessControlEnabled,
base::FeatureList::IsEnabled(features::kExtensionsMenuAccessControl));
+ BraveAddExtensionsResources(source);
+
patches/components-sync-driver-sync_stopped_reporter.h.patch
+5 -5
View File
@@ -1,11 +1,11 @@
diff --git a/components/sync/driver/sync_stopped_reporter.h b/components/sync/driver/sync_stopped_reporter.h
index a0763bc9d46d2dc159e8d7ec8a06e315ac32a104..d619cb9b9abf9a84fdc070dc013129c6719ddec6 100644
index d2fd5bd9d841802a27f2b2501082870d7cab3a6c..27213fb4fe5cc4f48d8a655b1f64f630b234e19b 100644
--- a/components/sync/driver/sync_stopped_reporter.h
+++ b/components/sync/driver/sync_stopped_reporter.h
@@ -32,7 +32,7 @@ class SyncStoppedReporter {
const std::string& user_agent,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
ResultCallback callback);
@@ -36,7 +36,7 @@ class SyncStoppedReporter {
SyncStoppedReporter(const SyncStoppedReporter&) = delete;
SyncStoppedReporter& operator=(const SyncStoppedReporter&) = delete;
- ~SyncStoppedReporter();
+ virtual ~SyncStoppedReporter();
patches/extensions-browser-extension_event_histogram_value.h.patch
+4 -4
View File
@@ -1,11 +1,11 @@
diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h
index d62e91e4a48ae617f5d828f5472bf41c9427d19c..7e5c469b732e0a95809ec869eb945bbeb0aa169d 100644
index 8e46633de297f5c77b7c118fc0588106420bcbb8..8e1352233f21946cc5b358c55764d597e4b587c5 100644
--- a/extensions/browser/extension_event_histogram_value.h
+++ b/extensions/browser/extension_event_histogram_value.h
@@ -501,6 +501,20 @@ enum HistogramValue {
ACCESSIBILITY_PRIVATE_ON_TOGGLE_DICTATION = 479,
WEB_AUTHENTICATION_PROXY_ON_ISUVPAA_REQUEST = 480,
@@ -503,6 +503,20 @@ enum HistogramValue {
SPEECH_RECOGNITION_PRIVATE_ON_STOP = 481,
SPEECH_RECOGNITION_PRIVATE_ON_RESULT = 482,
SPEECH_RECOGNITION_PRIVATE_ON_ERROR = 483,
+
+ BRAVE_START = 600,
+ BRAVE_AD_BLOCKED,
patches/net-dns-resolve_context.h.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/net/dns/resolve_context.h b/net/dns/resolve_context.h
index 4e57ea62a1c8aca0cdbf318c7078489dee8c725d..2b3c0fc7c081a1f53817d3f4469b5778de407a60 100644
index fc8618d346f1ff56b1ea4ec057bacd80c0f04150..3a7f836bbb9536c2a8bc1b666a83260773273591 100644
--- a/net/dns/resolve_context.h
+++ b/net/dns/resolve_context.h
@@ -175,6 +175,7 @@ class NET_EXPORT_PRIVATE ResolveContext : public base::CheckedObserver {
// (alternative service info if it supports QUIC, for instance).
const IsolationInfo& isolation_info() const { return isolation_info_; }
@@ -180,6 +180,7 @@ class NET_EXPORT_PRIVATE ResolveContext : public base::CheckedObserver {
return weak_ptr_factory_.GetSafeRef();
}
+ BRAVE_RESOLVE_CONTEXT_H
private:
patches/third_party-blink-renderer-modules-BUILD.gn.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
index 38947532b6558dfe00b1d22e80b2d7d0d497f2ac..bf02e4718f8750604e0aaed9a37954c7da471ed3 100644
index 8c52e525fad84b1d416d0334b66f24432cfd66f7..c36ecdb5695f964708da58f15add6d3f7321ff20 100644
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -15,6 +15,7 @@ if (is_android) {
@@ -10,11 +10,11 @@ index 38947532b6558dfe00b1d22e80b2d7d0d497f2ac..bf02e4718f8750604e0aaed9a37954c7
config("modules_implementation") {
defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
@@ -161,6 +162,7 @@ component("modules") {
"//third_party/blink/renderer/modules/xr",
]
@@ -166,6 +167,7 @@ component("modules") {
# generating the snapshot for android, blink is compiled with
# current_os="linux" and target_os="android". Using target_os is necessary as
# we need to compile in the same way as would happen when current_os="android".
+ sub_modules += brave_blink_sub_modules
if (is_android) {
if (target_os == "android") {
sub_modules += [ "//third_party/blink/renderer/modules/remote_objects" ]
} else {