content/shell/android/java/src/org/chromium/content_shell/ShellManager.java - Issue 12091033: Relanding "Add apk for running content_browsertests"

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/java/src/org/chromium/content_shell/ShellManager.java

Issue 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 11 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

« no previous file with comments | « content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java ('k') | content/shell/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4cc09069abd334fbacf06e8d64c1b2d3586f0ff9..7cf962d5f3798775b4c4ceaff4762fa100527f2c 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

@@ -21,11 +21,12 @@ import org.chromium.ui.gfx.NativeWindow;

@JNINamespace("content")

public class ShellManager extends FrameLayout {

+ public static final String DEFAULT_SHELL_URL = "http://www.google.com";

private static boolean sStartup = true;

private NativeWindow mWindow;

private Shell mActiveShell;

- private String mStartupUrl = ContentShellActivity.DEFAULT_SHELL_URL;

+ private String mStartupUrl = DEFAULT_SHELL_URL;

// The target for all content rendering.

private ContentViewRenderView mContentViewRenderView;

@@ -71,7 +72,7 @@ public class ShellManager extends FrameLayout {

/**

* @return The currently visible shell view or null if one is not showing.

- protected Shell getActiveShell() {

+ public Shell getActiveShell() {

return mActiveShell;

}