Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java |
| index 12b68b0365426a1388211b4e628dc4053ffc5966..3badea70efcf9f0f0cadc3d4ae1757c3a7c05d6a 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/document/IncognitoDocumentActivity.java |
| @@ -4,98 +4,8 @@ |
| package org.chromium.chrome.browser.document; |
| -import android.annotation.TargetApi; |
| -import android.content.Context; |
| -import android.os.Build; |
| -import android.os.Bundle; |
| - |
| -import org.chromium.chrome.browser.cookies.CookiesFetcher; |
| -import org.chromium.chrome.browser.incognito.IncognitoNotificationManager; |
| -import org.chromium.content.browser.crypto.CipherFactory; |
| -import org.chromium.content.browser.crypto.CipherFactory.CipherDataObserver; |
| - |
| /** |
| - * {@link DocumentActivity} for incognito tabs. |
| + * Deprecated, but kept around because it was exported in Chrome's Manifest. |
|
Ted C
2016/05/25 18:26:58
should we just create an activity alias instead of
gone
2016/05/25 20:22:19
Tried to do that, but we need the IncognitoDocumen
|
| */ |
| -@TargetApi(Build.VERSION_CODES.LOLLIPOP) |
| public class IncognitoDocumentActivity extends DocumentActivity { |
| - /** |
| - * Responsible for observing when cipher data generation is complete and saving |
| - * the new cipher data in the CipherKeyActivity. |
| - */ |
| - private static class CipherKeySaver implements CipherDataObserver { |
| - private final Context mContext; |
| - |
| - public CipherKeySaver(Context context) { |
| - mContext = context; |
| - CipherFactory.getInstance().addCipherDataObserver(this); |
| - } |
| - |
| - @Override |
| - public void onCipherDataGenerated() { |
| - mContext.startActivity( |
| - CipherKeyActivity.createIntent(mContext, null, null)); |
| - CipherFactory.getInstance().removeCipherDataObserver(this); |
| - } |
| - } |
| - |
| - private static CipherKeySaver sCipherKeySaver; |
| - |
| - private static void maybeCreateCipherKeySaver(Context context) { |
| - if (sCipherKeySaver == null && !CipherFactory.getInstance().hasCipher()) { |
| - sCipherKeySaver = new CipherKeySaver(context); |
| - } |
| - } |
| - |
| - @Override |
| - protected boolean isIncognito() { |
| - return true; |
| - } |
| - |
| - @Override |
| - public void preInflationStartup() { |
| - CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); |
| - maybeCreateCipherKeySaver(this); |
| - super.preInflationStartup(); |
| - } |
| - |
| - @Override |
| - public void onResume() { |
| - super.onResume(); |
| - IncognitoNotificationManager.showIncognitoNotification(); |
| - } |
| - |
| - @Override |
| - public void onResumeWithNative() { |
| - super.onResumeWithNative(); |
| - CookiesFetcher.restoreCookies(this); |
| - } |
| - |
| - @Override |
| - public void onPauseWithNative() { |
| - CookiesFetcher.persistCookies(this); |
| - super.onPauseWithNative(); |
| - } |
| - |
| - @Override |
| - public void onSaveInstanceState(Bundle outState) { |
| - super.onSaveInstanceState(outState); |
| - CipherFactory.getInstance().saveToBundle(outState); |
| - |
| - // Save out the URL that was originally used to spawn this activity because we don't pass it |
| - // in through the Intent. |
| - String initialUrl = determineInitialUrl(determineTabId()); |
| - outState.putString(KEY_INITIAL_URL, initialUrl); |
| - } |
| - |
| - @Override |
| - protected String determineInitialUrl(int tabId) { |
| - // Check if the URL was saved in the Bundle. |
| - if (getSavedInstanceState() != null) { |
| - String initialUrl = getSavedInstanceState().getString(KEY_INITIAL_URL); |
| - if (initialUrl != null) return initialUrl; |
| - } |
| - |
| - return super.determineInitialUrl(tabId); |
| - } |
| } |