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

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

Issue 2791183003: [Sync] Restore previous session if no tabbed windows present (Closed)
Patch Set: Fix ios compile Created 3 years, 8 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/TabState.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabState.java b/chrome/android/java/src/org/chromium/chrome/browser/TabState.java
index 72824c006eeab6f5658f3fd6b66c8b0f8a895745..030f592daf0d783fd903acfab111c101ea572971 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/TabState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabState.java
@@ -13,6 +13,7 @@ import android.util.Pair;
import org.chromium.base.StreamUtil;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.components.sync.SyncConstants;
import org.chromium.content.browser.crypto.CipherFactory;
import org.chromium.content_public.browser.WebContents;
@@ -256,9 +257,9 @@ public class TabState {
try {
tabState.syncId = stream.readLong();
} catch (EOFException eof) {
- tabState.syncId = 0;
+ tabState.syncId = SyncConstants.INVALID_TAB_NODE_ID;
// Could happen if reading a version of TabState without syncId.
- Log.w(TAG, "Failed to read syncId from tab state. Assuming syncId is: 0");
+ Log.w(TAG, "Failed to read syncId from tab state. Assuming syncId is: -1");
}
try {
tabState.shouldPreserve = stream.readBoolean();
@@ -484,4 +485,4 @@ public class TabState {
private static native void nativeFreeWebContentsStateBuffer(ByteBuffer buffer);
private static native void nativeCreateHistoricalTab(ByteBuffer state, int savedStateVersion);
-}
+}

Powered by Google App Engine
This is Rietveld 408576698