Revert 179189

content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content_shell;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.ui.gfx.NativeWindow;
 
 /**
  * Container and generator of ShellViews.
  */
 @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;
 
     /**
      * Constructor for inflating via XML.
      */
     public ShellManager(Context context, AttributeSet attrs) {
         super(context, attrs);
         nativeInit(this);
@@ skipping 25 matching lines @@
     /**
      * Sets the startup URL for new shell windows.
      */
     public void setStartupUrl(String url) {
         mStartupUrl = url;
     }
 
     /**
      * @return The currently visible shell view or null if one is not showing.
      */
-    public Shell getActiveShell() {
+    protected Shell getActiveShell() {
         return mActiveShell;
     }
 
     /**
      * Creates a new shell pointing to the specified URL.
      * @param url The URL the shell should load upon creation.
      */
     public void launchShell(String url) {
         nativeLaunchShell(url);
     }
@@ skipping 22 matching lines @@
             mContentViewRenderView.setCurrentContentView(contentView);
             contentView.onShow();
         }
 
         return shellView;
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }