Add-history-support-in-incognito-mode.patch

build/patches/Add-history-support-in-incognito-mode.patch

@@ -2,10 +2,18 @@ From: uazo <uazo@users.noreply.github.com>
 Date: Fri, 7 Aug 2020 16:33:47 +0000
 Subject: Add history support in incognito mode
 
-FILE:Add-history-support-in-incognito-mode.patch
 ---
+ .../java/res/xml/privacy_preferences.xml        |  5 +++++
+ .../privacy/settings/PrivacySettings.java       | 17 +++++++++++++++++
+ chrome/browser/history/history_tab_helper.cc    | 16 ++++++++++++++++
+ chrome/browser/history/history_tab_helper.h     |  4 ++++
+ chrome/browser/prefs/browser_prefs.cc           |  3 +++
+ .../android/strings/android_chrome_strings.grd  |  6 ++++++
+ chrome/common/pref_names.cc                     |  5 +++++
+ chrome/common/pref_names.h                      |  4 ++++
+ 8 files changed, 60 insertions(+)
+
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
-index 483e36a810..b5cddb590b 100644
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
 @@ -32,6 +32,11 @@
@@ -21,7 +29,6 @@ index 483e36a810..b5cddb590b 100644
          android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
          android:key="do_not_track"
 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
-index 8e78b57fe9..bb5f9af34e 100644
 --- 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
 @@ -55,11 +55,13 @@ public class PrivacySettings
@@ -75,7 +82,6 @@ index 8e78b57fe9..bb5f9af34e 100644
  
      private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
 diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
-index 10691cfe40..394f10cc0f 100644
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
 @@ -28,6 +28,9 @@
@@ -116,7 +122,6 @@ index 10691cfe40..394f10cc0f 100644
    // We update the history for this URL.
    WebContents* tab = web_contents();
 diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
-index 272cd24adc..d821a00b91 100644
 --- a/chrome/browser/history/history_tab_helper.h
 +++ b/chrome/browser/history/history_tab_helper.h
 @@ -10,6 +10,8 @@
@@ -138,7 +143,6 @@ index 272cd24adc..d821a00b91 100644
    explicit HistoryTabHelper(content::WebContents* web_contents);
    friend class content::WebContentsUserData<HistoryTabHelper>;
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 167237d466..3cfaac5930 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
 @@ -208,6 +208,8 @@
@@ -159,10 +163,9 @@ index 167237d466..3cfaac5930 100644
  #else   // defined(OS_ANDROID)
    AppShortcutManager::RegisterProfilePrefs(registry);
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 28babcf456..4ddaa32219 100644
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -865,6 +865,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -868,6 +868,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
          Opens links in incognito tabs when you click on new tab or on a link
        </message>
@@ -176,7 +179,6 @@ index 28babcf456..4ddaa32219 100644
          Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
        </message>
 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
-index e2b4a4acbd..adfc492a9c 100644
 --- a/chrome/common/pref_names.cc
 +++ b/chrome/common/pref_names.cc
 @@ -3175,4 +3175,9 @@ const char kCartModuleRemoved[] = "cart_module_removed";
@@ -190,7 +192,6 @@ index e2b4a4acbd..adfc492a9c 100644
 +
  }  // namespace prefs
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
-index 3d94234961..fdb6ae0c17 100644
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
 @@ -1112,6 +1112,10 @@ extern const char kCartModuleRemoved[];
@@ -204,3 +205,6 @@ index 3d94234961..fdb6ae0c17 100644
  }  // namespace prefs
  
  #endif  // CHROME_COMMON_PREF_NAMES_H_
+-- 
+2.17.1
+