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

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

Issue 12047068: Add apk for running content_browsertests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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;
}

Powered by Google App Engine
This is Rietveld 408576698