content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java - Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree

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: content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)

Patch Set: - Created 3 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

« content/public/browser/android/compositor.h ('K') | « content/public/browser/android/compositor.h ('k') | content/shell/android/java/src/org/chromium/content_shell/Shell.java » ('j') | content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

diff --git a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

index 9b938c9bf9326c3d0b8e96d25afa5ad6fe87ce97..ef31c799c74a58b34d9b97f14045938f0a0d4cd4 100644

--- a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

+++ b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

@@ -16,6 +16,7 @@ import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content_shell.ShellManager;

import org.chromium.native_test.NativeBrowserTestActivity;

import org.chromium.ui.base.ActivityWindowAndroid;

+import org.chromium.ui.base.ViewRoot;

import org.chromium.ui.base.WindowAndroid;

/** An Activity base class for running browser tests against ContentShell. */

@@ -47,7 +48,7 @@ public abstract class ContentShellBrowserTestActivity extends NativeBrowserTestA

setContentView(getTestActivityViewId());

mShellManager = (ShellManager) findViewById(getShellManagerViewId());

mWindowAndroid = new ActivityWindowAndroid(this);

- mShellManager.setWindow(mWindowAndroid);

+ mShellManager.setViewRoot(ViewRoot.create(mWindowAndroid));

Window wind = this.getWindow();

wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);