chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java - Issue 2426083002: Clean up other instances where Tab WindowAndroid was being set to null.

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/vr_shell/VrShellImpl.java

Issue 2426083002: Clean up other instances where Tab WindowAndroid was being set to null. (Closed)

Patch Set: Rebase Created 4 years, 1 month 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/tab/Tab.java ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

index 87265fa0f880c1c92b16bffd97cafc3a4ccc85f4..470b8fee24bb8d89551590c8d2f20aa21f6111a7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

@@ -162,8 +162,6 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr

private void reparentContentWindow() {

mOriginalWindowAndroid = mContentCVC.getWindowAndroid();

- // TODO(mthiesse): Update the WindowAndroid in ChromeActivity too?

- mTab.updateWindowAndroid(null);

mTab.updateWindowAndroid(mContentVrWindowAndroid);

ViewGroup contentContentView = mContentCVC.getContainerView();

@@ -179,7 +177,6 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr

private void restoreContentWindow() {

ViewGroup contentContentView = mContentCVC.getContainerView();

- mTab.updateWindowAndroid(null);

mTab.updateWindowAndroid(mOriginalWindowAndroid);

mContentViewCoreContainer.removeView(contentContentView);

mOriginalContentViewParent.addView(contentContentView, mOriginalContentViewIndex,