chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java - Issue 2946223002: Replaces FullscreenActivity with SingleTabActivity.

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/contextmenu/ChromeContextMenuPopulator.java

Issue 2946223002: Replaces FullscreenActivity with SingleTabActivity. (Closed)

Patch Set: Removes the WebContentsObserver on reparenting in FullscreenWebContentsActivity Created 3 years, 5 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/SingleTabActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/FullScreenActivity.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/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 42f3af633911df76901a53a41cbbdbca6fba19d5..52bec84115cf3eddb423a17c24c287678d5da22e 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

@@ -68,13 +68,13 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@IntDef({

NORMAL_MODE, /* Default mode */

CUSTOM_TAB_MODE, /* Custom tab mode */

- FULLSCREEN_TAB_MODE /* Full screen mode */

+ WEB_APP_MODE /* Full screen mode */

})

public @interface ContextMenuMode {}

public static final int NORMAL_MODE = 0;

public static final int CUSTOM_TAB_MODE = 1;

- public static final int FULLSCREEN_TAB_MODE = 2;

+ public static final int WEB_APP_MODE = 2;

// Items that are included in all context menus.

private static final Set<? extends ContextMenuItem> BASE_WHITELIST =

@@ -103,7 +103,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

ChromeContextMenuItem.OPEN_IN_BROWSER_ID));

// Additional items for fullscreen tabs mode.

- private static final Set<? extends ContextMenuItem> FULLSCREEN_TAB_MODE_WHITELIST =

+ private static final Set<? extends ContextMenuItem> WEB_APP_MODE_WHITELIST =

Collections.unmodifiableSet(

CollectionUtil.newHashSet(ChromeContextMenuItem.OPEN_IN_CHROME));

@@ -285,8 +285,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

Set<ContextMenuItem> supportedOptions = new HashSet<>();

if (FirstRunStatus.getFirstRunFlowComplete()) {

supportedOptions.addAll(BASE_WHITELIST);

- if (mMode == FULLSCREEN_TAB_MODE) {

- supportedOptions.addAll(FULLSCREEN_TAB_MODE_WHITELIST);

+ if (mMode == WEB_APP_MODE) {

+ supportedOptions.addAll(WEB_APP_MODE_WHITELIST);

} else if (mMode == CUSTOM_TAB_MODE) {

supportedOptions.addAll(CUSTOM_TAB_MODE_WHITELIST);

} else {