Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3472)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java

Issue 2166943002: Fix incognito tabs persisting when cct service is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove tests Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
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
index a2a49e965438d7f6800353a31f93791214eec4a3..d1580ebcf596375d8fe2de0b16a49cac98baefa1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -379,8 +379,9 @@ public class TabPersistentStore extends TabPersister {
/**
* Restore saved state. Must be called before any tabs are added to the list.
+ * @param ignoreIncognitoFiles Whether to skip loading incognito tabs.
*/
- public void loadState() {
+ public void loadState(boolean ignoreIncognitoFiles) {
long time = SystemClock.uptimeMillis();
// If a cleanup task is in progress, cancel it before loading state.
@@ -392,7 +393,7 @@ public class TabPersistentStore extends TabPersister {
logExecutionTime("LoadStateTime", time);
mCancelNormalTabLoads = false;
- mCancelIncognitoTabLoads = false;
+ mCancelIncognitoTabLoads = ignoreIncognitoFiles;
mNormalTabsRestored = new SparseIntArray();
mIncognitoTabsRestored = new SparseIntArray();
try {

Powered by Google App Engine
This is Rietveld 408576698