PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

AUTOMATED - git apply results

Browse Source
This commit is contained in:
uazo
2023-04-19 10:55:10 +00:00
committed by GitHub
parent 0ef3b2ad88
commit 5820cd9fd5
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00AdblockPlus.patch
+1 -1
View File
@@ -170526,7 +170526,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
</enum>
<enum name="ExtensionPointEnableState">
@@ -102457,6 +102491,8 @@ Full version information for the fingerprint enum values:
@@ -102464,6 +102498,8 @@ Full version information for the fingerprint enum values:
<int value="29" label="kMediaStorageIdSalt"/>
<int value="30" label="kModuleBlocklistCacheMD5Digest"/>
<int value="32" label="kMediaCdmOriginData"/>
build/patches/Add-flag-for-save-data-header.patch
+2 -2
View File
@@ -94,8 +94,8 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
+ base::FEATURE_DISABLED_BY_DEFAULT);
+
BASE_FEATURE(kNetworkErrorLogging,
"NetworkErrorLogging",
base::FEATURE_ENABLED_BY_DEFAULT);
"NetworkErrorLogging", // disabled by default
base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
build/patches/Add-lifetime-options-for-permissions.patch
+6 -6
View File
@@ -1268,7 +1268,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
request->RequestFinished();
return;
@@ -540,14 +540,15 @@ void PermissionRequestManager::Accept() {
@@ -544,14 +544,15 @@ void PermissionRequestManager::Accept() {
(*requests_iter)->request_type(),
PermissionAction::GRANTED);
PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1286,7 +1286,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_)
return;
DCHECK(view_);
@@ -558,7 +559,8 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -562,7 +563,8 @@ void PermissionRequestManager::AcceptThisTime() {
(*requests_iter)->request_type(),
PermissionAction::GRANTED_ONCE);
PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1296,7 +1296,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
@@ -566,6 +568,15 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -570,6 +572,15 @@ void PermissionRequestManager::AcceptThisTime() {
}
void PermissionRequestManager::Deny() {
@@ -1312,7 +1312,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_)
return;
DCHECK(view_);
@@ -588,7 +599,7 @@ void PermissionRequestManager::Deny() {
@@ -592,7 +603,7 @@ void PermissionRequestManager::Deny() {
StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
(*requests_iter)->request_type(),
PermissionAction::DENIED);
@@ -1321,7 +1321,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(PermissionAction::DENIED);
@@ -1036,25 +1047,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
@@ -1050,25 +1061,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
PermissionRequest* request,
@@ -1353,7 +1353,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
void PermissionRequestManager::CancelledIncludingDuplicates(
@@ -1281,7 +1292,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
@@ -1295,7 +1306,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
void PermissionRequestManager::DoAutoResponseForTesting() {
switch (auto_response_for_test_) {
case ACCEPT_ONCE:
build/patches/Disable-conversion-measurement-api.patch
+1 -1
View File
@@ -89,7 +89,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
--- a/content/browser/attribution_reporting/attribution_host.cc
+++ b/content/browser/attribution_reporting/attribution_host.cc
@@ -189,6 +189,7 @@ void AttributionHost::DidRedirectNavigation(
@@ -188,6 +188,7 @@ void AttributionHost::DidRedirectNavigation(
return;
}
build/patches/Disable-safe-browsing.patch
+1 -1
View File
@@ -2980,7 +2980,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -706,10 +706,7 @@ PermissionRequestManager::PermissionRequestManager(
@@ -715,10 +715,7 @@ PermissionRequestManager::PermissionRequestManager(
view_factory_(base::BindRepeating(&PermissionPrompt::Create)),
tab_is_hidden_(web_contents->GetVisibility() ==
content::Visibility::HIDDEN),
build/patches/Enable-share-intent.patch
+1 -1
View File
@@ -371,7 +371,7 @@ new file mode 100644
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -8939,6 +8939,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_ANDROID)
build/patches/Move-navigation-bar-to-bottom.patch
+1 -1
View File
@@ -1611,7 +1611,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7087,6 +7087,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7084,6 +7084,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},