Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java |
| index 581a891a225b65126d60d74f92f444ce329271f0..3c68bafe9b0822321bb06bcedc9d5ca43cdce707 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java |
| @@ -14,9 +14,11 @@ import android.view.ContextMenu; |
| import android.webkit.MimeTypeMap; |
| import org.chromium.base.CollectionUtil; |
| +import org.chromium.base.CommandLine; |
| import org.chromium.base.metrics.RecordHistogram; |
| import org.chromium.chrome.R; |
| import org.chromium.chrome.browser.ChromeFeatureList; |
| +import org.chromium.chrome.browser.ChromeSwitches; |
| import org.chromium.chrome.browser.firstrun.FirstRunStatus; |
| import org.chromium.chrome.browser.preferences.ChromePreferenceManager; |
| import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma; |
| @@ -256,7 +258,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { |
| ContextMenu menu, Context context, ContextMenuParams params) { |
| // Add all items in a group |
| Set<ContextMenuItem> supportedOptions = new HashSet<>(); |
| - if (FirstRunStatus.getFirstRunFlowComplete()) { |
| + // Limit context menu to copying until FRE has been completed, |
|
dominickn
2017/05/23 03:20:13
Amend this comment as discussed.
piotrs
2017/05/23 04:11:11
Done.
|
| + // unless FRE has been explicitly disabled. |
| + if (FirstRunStatus.getFirstRunFlowComplete() |
| + || CommandLine.getInstance().hasSwitch( |
| + ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)) { |
| supportedOptions.addAll(BASE_WHITELIST); |
| if (mMode == FULLSCREEN_TAB_MODE) { |
| supportedOptions.addAll(FULLSCREEN_TAB_MODE_WHITELIST); |