Minor patch cleanup

This commit is contained in:
csagan5 2020-08-15 23:22:16 +02:00
parent d1e398ce3a
commit 5dd2efd498
2 changed files with 3 additions and 11 deletions

View file

@ -146,4 +146,5 @@ Block-gateway-attacks-via-websockets.patch
Enable-prefetch-privacy-changes-by-default.patch
Enable-reduced-referrer-granularity-by-default.patch
Restore-duet-flags.patch
Add-history-support-in-incognito-mode.patch
Automated-domain-substitution.patch

View file

@ -1,5 +1,6 @@
From: uazo <uazo@users.noreply.github.com>
Date: Fri, 7 Aug 2020 16:33:47 +0000
Subject: [PATCH] history_on_incognito
Subject: Add history support in incognito mode
---
.../java/res/xml/privacy_preferences.xml | 5 +++++
@ -27,7 +28,6 @@ Subject: [PATCH] history_on_incognito
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
old mode 100644
new mode 100755
index 5e1e76c2a8..d87f8def22
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -34,6 +34,11 @@
@ -45,7 +45,6 @@ index 5e1e76c2a8..d87f8def22
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
old mode 100644
new mode 100755
index 7c40db13be..5c8f97209f
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -34,6 +34,8 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
@ -104,7 +103,6 @@ index 7c40db13be..5c8f97209f
diff --git a/chrome/browser/android/preferences/prefs.h b/chrome/browser/android/preferences/prefs.h
old mode 100644
new mode 100755
index 3d8971833e..b5c2057b63
--- a/chrome/browser/android/preferences/prefs.h
+++ b/chrome/browser/android/preferences/prefs.h
@@ -67,6 +67,7 @@ enum Pref {
@ -126,7 +124,6 @@ index 3d8971833e..b5c2057b63
diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
old mode 100644
new mode 100755
index a1d75306b2..c8406bb58f
--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
@@ -29,6 +29,9 @@
@ -169,7 +166,6 @@ index a1d75306b2..c8406bb58f
diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
old mode 100644
new mode 100755
index 6782ba38ba..6d1bf75e6b
--- a/chrome/browser/history/history_tab_helper.h
+++ b/chrome/browser/history/history_tab_helper.h
@@ -10,6 +10,8 @@
@ -193,7 +189,6 @@ index 6782ba38ba..6d1bf75e6b
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
old mode 100644
new mode 100755
index 3d00fae9dc..6d6953cca7
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -232,6 +232,7 @@
@ -215,7 +210,6 @@ index 3d00fae9dc..6d6953cca7
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
old mode 100644
new mode 100755
index 433ab2dfa3..c46bb2c55e
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -746,6 +746,12 @@ Your Google account may have other forms of browsing history like searches and a
@ -234,7 +228,6 @@ index 433ab2dfa3..c46bb2c55e
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
old mode 100644
new mode 100755
index b425abafde..9960138a7a
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
@@ -1011,4 +1011,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun
@ -247,7 +240,6 @@ index b425abafde..9960138a7a
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
old mode 100644
new mode 100755
index e49716dcc3..72109377cb
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -2996,4 +2996,9 @@ const char kMediaFeedsSafeSearchEnabled[] = "media_feeds_safe_search_enabled";
@ -263,7 +255,6 @@ index e49716dcc3..72109377cb
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
old mode 100644
new mode 100755
index 2e3213f192..acb3c82d75
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1064,6 +1064,10 @@ extern const char kMediaFeedsSafeSearchEnabled[];