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

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

Issue 12088031: Revert 179189 (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
===================================================================
--- content/shell/android/java/src/org/chromium/content_shell/ShellManager.java (revision 179209)
+++ content/shell/android/java/src/org/chromium/content_shell/ShellManager.java (working copy)
@@ -21,12 +21,11 @@
@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 = DEFAULT_SHELL_URL;
+ private String mStartupUrl = ContentShellActivity.DEFAULT_SHELL_URL;
// The target for all content rendering.
private ContentViewRenderView mContentViewRenderView;
@@ -72,7 +71,7 @@
/**
* @return The currently visible shell view or null if one is not showing.
*/
- public Shell getActiveShell() {
+ protected Shell getActiveShell() {
return mActiveShell;
}

Powered by Google App Engine
This is Rietveld 408576698