chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 2296833002: Add tab persistence support for CustomTabs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2296833002: Add tab persistence support for CustomTabs. (Closed)

Patch Set: Fix test Created 4 years, 3 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

« no previous file with comments | « base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

index 6544d5dd86bce1e5416677b457ba7377af9e5afc..379023e41253795a21b733c163f7a6f7101676ff 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -58,7 +58,6 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;

import org.chromium.chrome.browser.tabmodel.TabModelObserver;

import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;

import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy;

-import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy;

import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;

import org.chromium.chrome.browser.util.ColorUtils;

import org.chromium.chrome.browser.util.FeatureUtilities;

@@ -264,11 +263,8 @@ public class CustomTabActivity extends ChromeActivity {

@Override

public void postInflationStartup() {

super.postInflationStartup();

- // TODO(tedchoc): Replace with an actual CCT implementation for the persistence policy.

- // Currently, this relies on checks for CUSTOM_TABS_SELECTOR_INDEX in the

- // main TabPersitentStore that ignores certain actions.

- TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(

- this, TabModelSelectorImpl.CUSTOM_TABS_SELECTOR_INDEX);

+ TabPersistencePolicy persistencePolicy = new CustomTabTabPersistencePolicy(

+ getTaskId(), getSavedInstanceState() != null);

setTabModelSelector(new TabModelSelectorImpl(

this, persistencePolicy, getWindowAndroid(), false));