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

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

Issue 2270163002: Delete more document mode specific code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
index 21a0fe94459a616c6fdcf91ec90dce75cb0ddda9..77af31f34158f9e7135f25ae7307f9779b503011 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
@@ -23,21 +23,18 @@ import org.chromium.base.ApplicationStatus;
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.ChromeApplication;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.TabState;
import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.document.DocumentUtils;
import org.chromium.chrome.browser.tabmodel.TabPersistentStore;
import org.chromium.chrome.browser.tabmodel.TabWindowManager;
-import org.chromium.chrome.browser.util.FeatureUtilities;
import java.io.File;
import java.lang.ref.WeakReference;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.Callable;
/**
* Service that handles the action of clicking on the incognito notification.
@@ -63,29 +60,10 @@ public class IncognitoNotificationService extends IntentService {
@Override
protected void onHandleIntent(Intent intent) {
- boolean isDocumentMode = ThreadUtils.runOnUiThreadBlockingNoException(
- new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
- return FeatureUtilities.isDocumentMode(IncognitoNotificationService.this);
- }
- });
-
- boolean clearedIncognito = true;
- if (isDocumentMode) {
- // TODO(dfalcantara): Delete this when document mode goes away.
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ChromeApplication.getDocumentTabModelSelector().getModel(true).closeAllTabs();
- }
- });
- } else {
- closeIncognitoTabsInRunningTabbedActivities();
+ closeIncognitoTabsInRunningTabbedActivities();
- clearedIncognito = deleteIncognitoStateFilesInDirectory(
- TabPersistentStore.getOrCreateStateDirectory());
- }
+ boolean clearedIncognito = deleteIncognitoStateFilesInDirectory(
+ TabPersistentStore.getOrCreateStateDirectory());
// If we failed clearing all of the incognito tabs, then do not dismiss the notification.
if (!clearedIncognito) return;
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698