chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java - Issue 1854253002: Disable document mode.

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/tabmodel/DocumentModeAssassin.java

Issue 1854253002: Disable document mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleaning Created 4 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.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/tabmodel/DocumentModeAssassin.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java

index d1cabe2d642bedcea117475ce3cccbfa09585f97..fddb546461e5e8e9860cfbc32505d60b89963899 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java

@@ -13,7 +13,6 @@ import android.preference.PreferenceManager;

import android.util.Pair;

import org.chromium.base.ApplicationStatus;

-import org.chromium.base.CommandLine;

import org.chromium.base.FileUtils;

import org.chromium.base.Log;

import org.chromium.base.ObserverList;

@@ -21,7 +20,6 @@ import org.chromium.base.StreamUtil;

import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.browser.ChromeApplication;

-import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.TabState;

import org.chromium.chrome.browser.document.DocumentActivity;

import org.chromium.chrome.browser.document.DocumentUtils;

@@ -519,10 +517,7 @@ public class DocumentModeAssassin {

/** @return Whether or not a migration to tabbed mode from document mode is necessary. */

public boolean isMigrationNecessary() {

- return (CommandLine.getInstance().hasSwitch(

- ChromeSwitches.ENABLE_FORCED_MIGRATION_TO_TABBED_MODE)

- || FeatureUtilities.isForcedToMigrateToTabbedMode())

- && FeatureUtilities.isDocumentMode(ApplicationStatus.getApplicationContext());

+ return FeatureUtilities.isDocumentMode(ApplicationStatus.getApplicationContext());

}

/** @return Context to use when grabbing SharedPreferences, Files, and other resources. */