Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3547)

Unified Diff: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.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
Index: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
index 46396eda086ac8954f5f8206d2ec0a57426081fc..7466ed954bd9d3b118b7fde9b837c9fe10de092f 100644
--- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
+++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
@@ -25,6 +25,7 @@ import org.chromium.content.browser.ContentViewCore;
import org.chromium.content_shell.Shell;
import org.chromium.content_shell.ShellManager;
import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.ViewRoot;
/**
* Test activity used for verifying the different configuration options for the ContentLinker.
@@ -49,6 +50,7 @@ public class ChromiumLinkerTestActivity extends Activity {
private static final String USE_LEGACY_LINKER = "--use-linker=legacy";
private ShellManager mShellManager;
+ private ViewRoot mViewRoot;
private ActivityWindowAndroid mWindowAndroid;
@SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
@@ -134,7 +136,8 @@ public class ChromiumLinkerTestActivity extends Activity {
View view = inflater.inflate(R.layout.test_activity, null);
mShellManager = (ShellManager) view.findViewById(R.id.shell_container);
mWindowAndroid = new ActivityWindowAndroid(this);
- mShellManager.setWindow(mWindowAndroid);
+ mViewRoot = ViewRoot.create(mWindowAndroid);
boliu 2017/02/13 22:58:08 this is an existing bug that the windowandroid her
Jinsuk Kim 2017/02/14 05:09:59 Done. Added onDestroy() for that.
+ mShellManager.setViewRoot(mViewRoot);
mShellManager.setStartupUrl("about:blank");

Powered by Google App Engine
This is Rietveld 408576698