From 67dc28859db5638417dab8e55f6896a14befec90 Mon Sep 17 00:00:00 2001
From: Carmelo Messina <carmelo.messina@uazo.it>
Date: Mon, 17 Aug 2020 16:02:25 +0200
Subject: [PATCH] force incognito profile when mStartIncognito is true

---
 .../Add-an-always-incognito-mode.patch        | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
index 76355646..11cd9a17 100644
--- a/build/patches/Add-an-always-incognito-mode.patch
+++ b/build/patches/Add-an-always-incognito-mode.patch
@@ -17,10 +17,11 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
  .../CustomTabIntentDataProvider.java          |  6 ++
  .../browser/init/StartupTabPreloader.java     | 11 ++-
  .../browser/tabmodel/ChromeTabCreator.java    | 16 +++-
+ .../tabmodel/TabModelSelectorBase.java        |  9 +++
  .../browser/tabmodel/TabPersistentStore.java  |  9 +++
  .../flags/android/chrome_feature_list.cc      |  2 +-
  .../strings/android_chrome_strings.grd        |  7 ++
- 13 files changed, 147 insertions(+), 8 deletions(-)
+ 14 files changed, 156 insertions(+), 8 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
@@ -341,6 +342,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
          mTabModel.addTab(tab, index, launchType, creationState);
          return tab;
      }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+@@ -246,6 +246,15 @@ public abstract class TabModelSelectorBase implements TabModelSelector {
+         if (mTabStateInitialized) return;
+         mTabStateInitialized = true;
+         for (TabModelSelectorObserver listener : mObservers) listener.onTabStateInitialized();
++
++        if (mStartIncognito) {
++          // @uazo
++          // in TabModelSelectorProfileSupplier
++          // when in always incognito, 
++          // profile is not set, so force it
++          selectModel(false); // restore model so next call always set incognito mode
++          selectModel(true);
++        }
+     }
+ 
+     @Override
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -396,6 +416,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
          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>
--- 
-2.17.1
-