Fix Android ContentShell's incorrect behavior when opening link with window.open.

Fixed the two following issues:
- When open a link with 'window.open', new shell content is not rendered
  correctly, the content is always DEFAULT_SHELL_URL(http://www.google.com).
- When ContentShell activity is stopped and restarted, the rendered content is
  clear and reload to DEFAULT_SHELL_URL.

BUG=165745
TEST=manual: verified link in news.google.com is opened and rendered correctly


Review URL: https://chromiumcodereview.appspot.com/11574003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173370 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

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 91dc4c2..4cc0906 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,6 +21,7 @@ import org.chromium.ui.gfx.NativeWindow;
 @JNINamespace("content")
 public class ShellManager extends FrameLayout {
 
+    private static boolean sStartup = true;
     private NativeWindow mWindow;
     private Shell mActiveShell;
 
@@ -38,7 +39,10 @@ public class ShellManager extends FrameLayout {
         mContentViewRenderView = new ContentViewRenderView(context) {
             @Override
             protected void onReadyToRender() {
-                mActiveShell.loadUrl(mStartupUrl);
+                if (sStartup) {
+                    mActiveShell.loadUrl(mStartupUrl);
+                    sStartup = false;
+                }
             }
         };
     }