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

Unified Diff: content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

Issue 888793002: Make content_browsertests for Chrome on Android running with valid Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comments Created 5 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/java/src/org/chromium/content_shell/ShellManager.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
index bb9a5d62c7361015499159ba821e04711c6b12a3..2715e4c689533ca02f01d71e0646c2ab1a49ef6d 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
@@ -14,6 +14,7 @@ import android.widget.FrameLayout;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
+import org.chromium.base.VisibleForTesting;
import org.chromium.content.browser.ActivityContentVideoViewClient;
import org.chromium.content.browser.ContentVideoViewClient;
import org.chromium.content.browser.ContentViewClient;
@@ -68,13 +69,22 @@ public class ShellManager extends FrameLayout {
* @param window The window used to generate all shells.
*/
public void setWindow(WindowAndroid window) {
+ setWindow(window, true);
+ }
+
+ /**
+ * @param window The window used to generate all shells.
+ * @param initialLoadingNeeded Whether initial loading is needed or not.
+ */
+ @VisibleForTesting
+ public void setWindow(WindowAndroid window, final boolean initialLoadingNeeded) {
assert window != null;
mWindow = window;
mContentViewRenderView = new ContentViewRenderView(getContext()) {
@Override
protected void onReadyToRender() {
if (sStartup) {
- mActiveShell.loadUrl(mStartupUrl);
+ if (initialLoadingNeeded) mActiveShell.loadUrl(mStartupUrl);
sStartup = false;
}
}

Powered by Google App Engine
This is Rietveld 408576698