chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java - Issue 1155113004: Merge ApplicationSwitches.java and ChromeSwitches.java

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_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

Issue 1155113004: Merge ApplicationSwitches.java and ChromeSwitches.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java ('K') | « chrome/android/java_staging/src/org/chromium/chrome/browser/ApplicationSwitches.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

index e8c6acfa4216f394ee237506e0214ab9bf32b34c..7a63de6f15669214fc156177d02ed710dd1afd01 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

@@ -13,7 +13,6 @@ import com.google.android.apps.chrome.R;

import org.chromium.base.CommandLine;

import org.chromium.base.ObserverList;

import org.chromium.base.metrics.RecordHistogram;

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

import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.ChromeVersionInfo;

import org.chromium.chrome.browser.CompositorChromeActivity;

@@ -296,12 +295,12 @@ public class ReaderModeManager extends EmptyTabObserver

boolean enabled = CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_DOM_DISTILLER)

&& !CommandLine.getInstance().hasSwitch(

- ApplicationSwitches.DISABLE_READER_MODE_BOTTOM_BAR)

+ ChromeSwitches.DISABLE_READER_MODE_BOTTOM_BAR)

&& !DeviceFormFactor.isTablet(context);

if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) {

enabled = enabled

&& CommandLine.getInstance().hasSwitch(

- ApplicationSwitches.ENABLE_READER_MODE_BUTTON);

+ ChromeSwitches.ENABLE_READER_MODE_BUTTON);

}

return enabled;

}