chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java - Issue 1710213002: Consolidate/clarify TabLaunchTypes

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/compositor/layouts/LayoutManagerChrome.java

Issue 1710213002: Consolidate/clarify TabLaunchTypes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing Created 4 years, 10 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/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.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/compositor/layouts/LayoutManagerChrome.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

index c6481822440cad6ed49c8faa9818c62d295c53da..91902fa3ab844b68f868e7be6e6b7c9cb271a20b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

@@ -90,7 +90,7 @@ public class LayoutManagerChrome

@Override

public void willAddTab(Tab tab, TabLaunchType type) {

// Open the new tab

- if (type == TabLaunchType.FROM_INSTANT || type == TabLaunchType.FROM_RESTORE) return;

+ if (type == TabLaunchType.FROM_RESTORE) return;

tabCreating(getTabModelSelector().getCurrentTabId(), tab.getUrl(), tab.isIncognito());

}

@@ -98,14 +98,13 @@ public class LayoutManagerChrome

@Override

public void didAddTab(Tab tab, TabLaunchType launchType) {

int tabId = tab.getId();

- if (launchType != TabLaunchType.FROM_INSTANT

- && launchType != TabLaunchType.FROM_RESTORE) {

+ if (launchType != TabLaunchType.FROM_RESTORE) {

boolean incognito = tab.isIncognito();

boolean willBeSelected = launchType != TabLaunchType.FROM_LONGPRESS_BACKGROUND

|| (!getTabModelSelector().isIncognitoSelected() && incognito);

float lastTapX = LocalizationUtils.isLayoutRtl() ? mLastContentWidthDp : 0.f;

float lastTapY = 0.f;

- if (launchType != TabLaunchType.FROM_MENU_OR_OVERVIEW) {

+ if (launchType != TabLaunchType.FROM_CHROME_UI) {

float heightDelta =

mLastFullscreenViewportDp.height() - mLastVisibleViewportDp.height();

lastTapX = mPxToDp * mLastTapX;