chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java - Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled.

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/tab/TabContentViewParent.java

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)

Patch Set: Magic now happens Created 4 years, 4 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

« blimp/client/public/android/java/src/org/chromium/blimp_public/BlimpClientContext.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java ('k') | chrome/browser/android/tab_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java

index d2104ad73fdaa5a11cc629e3337634e07cbeb60a..79ae73f5dd1e4d275ec5a8deaab38756a670ded4 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java

@@ -37,7 +37,9 @@ public class TabContentViewParent extends FrameLayout {

if (tab.getNativePage() != null) {

viewToShow = tab.getNativePage().getView();

if (isShowing(viewToShow)) return;

+ } else if (tab.getBlimpContents() != null) {

+ viewToShow = tab.getBlimpContents().getView();

+ if (isShowing(viewToShow)) return;

} else {

viewToShow = tab.getContentViewCore().getContainerView();

if (isShowing(viewToShow)) return;