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

AUTOMATED - git apply results

Browse Source
This commit is contained in:
uazo
2023-07-22 14:49:13 +00:00
committed by GitHub
parent 8ea8e4273a
commit 4344d5566e
16 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00Disable-GSA-by-default.patch
+2 -2
View File
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -677,8 +677,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations,
@@ -678,8 +678,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kContextMenuSearchWithGoogleLens,
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kContextMenuShopWithGoogleLens,
"ContextMenuShopWithGoogleLens",
@@ -759,8 +759,8 @@ BASE_FEATURE(kOfflineIndicatorV2,
@@ -760,8 +760,8 @@ BASE_FEATURE(kOfflineIndicatorV2,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kExperimentsForAgsa,
build/patches/00Disable-privacy-issues-in-password-manager.patch
+1 -1
View File
@@ -16,7 +16,7 @@ Subject: Disable privacy issues in password manager
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -468,15 +468,6 @@ by a child template that "extends" this file.
@@ -458,15 +458,6 @@ by a child template that "extends" this file.
</intent-filter>
</receiver>
build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch
+1 -1
View File
@@ -140,7 +140,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orderingFromXml="false">
@@ -106,7 +97,7 @@ Use of this source code is governed by the GPLv3 that can be found in the compon
@@ -101,7 +92,7 @@ Use of this source code is governed by the GPLv3 that can be found in the compon
android:title="@string/prefs_accessibility"/>
<Preference
android:fragment="org.chromium.components.adblock.settings.AdblockSettingsFragment"
build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch
+1 -1
View File
@@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions
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
@@ -9451,11 +9451,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9453,11 +9453,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
#endif
build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch
+1 -1
View File
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
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
@@ -8124,9 +8124,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8126,9 +8126,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
build/patches/Add-flag-for-save-data-header.patch
+1 -1
View File
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -5252,7 +5252,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5254,7 +5254,10 @@ const FeatureEntry kFeatureEntries[] = {
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
build/patches/Add-flag-to-disable-vibration.patch
+1 -1
View File
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -7898,6 +7898,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7900,6 +7900,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
#endif
build/patches/Add-site-engagement-flag.patch
+1 -1
View File
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/shared_highlighting/core/common/shared_highlighting_features.h"
#include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
#include "components/signin/public/base/signin_buildflags.h"
@@ -9426,6 +9427,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9428,6 +9429,11 @@ const FeatureEntry kFeatureEntries[] = {
kLargeFaviconFromGoogleVariations,
"LargeFaviconFromGoogle")},
build/patches/Allow-building-without-supervised-users.patch
+1 -1
View File
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kChromeRefresh2023Level1[] = {{"level", "1"}};
@@ -7689,11 +7691,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7691,11 +7693,13 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID)
build/patches/Disable-TLS-resumption.patch
+1 -1
View File
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -5290,6 +5290,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5292,6 +5292,12 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-tls13-kyber", flag_descriptions::kEnableTLS13KyberName,
flag_descriptions::kEnableTLS13KyberDescription, kOsAll,
FEATURE_VALUE_TYPE(net::features::kPostQuantumKyber)},
build/patches/Enable-Certificate-Transparency.patch
+1 -1
View File
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -9384,6 +9384,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9386,6 +9386,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebMidiDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebMidi)},
build/patches/Enable-share-intent.patch
+1 -1
View File
@@ -384,7 +384,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
@@ -9782,6 +9782,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9784,6 +9784,10 @@ const FeatureEntry kFeatureEntries[] = {
features::kBrokerFileOperationsOnDiskCacheInNetworkService)},
#if BUILDFLAG(IS_ANDROID)
build/patches/Experimental-user-scripts-support.patch
+1 -1
View File
@@ -344,7 +344,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/version_info/version_info.h"
#include "components/viz/common/features.h"
#include "components/viz/common/switches.h"
@@ -8107,6 +8108,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8109,6 +8110,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
build/patches/Move-navigation-bar-to-bottom.patch
+1 -1
View File
@@ -1606,7 +1606,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
@@ -7863,6 +7863,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7865,6 +7865,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
build/patches/Restore-offline-indicator-v2-flag.patch
+1 -1
View File
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
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
@@ -5123,6 +5123,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5125,6 +5125,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOfflinePagesLivePageSharingName,
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
build/patches/eyeo-beta-114.0.5735.53-v1-android_settings.patch
+2 -2
View File
@@ -245,7 +245,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
@@ -101,10 +104,15 @@ found in the LICENSE file.
@@ -96,10 +99,15 @@ found in the LICENSE file.
android:key="accessibility"
android:order="17"
android:title="@string/prefs_accessibility"/>
@@ -262,7 +262,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
android:title="@string/prefs_site_settings"/>
<Preference
android:fragment="org.chromium.chrome.browser.settings.UserAgentPreferences"
@@ -119,22 +127,22 @@ found in the LICENSE file.
@@ -114,22 +122,22 @@ found in the LICENSE file.
<Preference
android:fragment="org.chromium.chrome.browser.language.settings.LanguageSettings"
android:key="languages"