Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
index af13bbfe3d446b90957de44038eb1e67b5cbb59d..881bfc0fe488378699dbba72edd7ddcad11bfac9 100644 |
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
@@ -42,6 +42,7 @@ public class ContentShellActivity extends Activity { |
private ShellManager mShellManager; |
private ActivityWindowAndroid mWindowAndroid; |
private Intent mLastSentIntent; |
+ private String mStartupUrl; |
@Override |
@SuppressFBWarnings("DM_EXIT") |
@@ -81,9 +82,9 @@ public class ContentShellActivity extends Activity { |
mWindowAndroid.setAnimationPlaceholderView( |
mShellManager.getContentViewRenderView().getSurfaceView()); |
- String startupUrl = getUrlFromIntent(getIntent()); |
- if (!TextUtils.isEmpty(startupUrl)) { |
- mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl)); |
+ mStartupUrl = getUrlFromIntent(getIntent()); |
+ if (!TextUtils.isEmpty(mStartupUrl)) { |
+ mShellManager.setStartupUrl(Shell.sanitizeUrl(mStartupUrl)); |
} |
if (CommandLine.getInstance().hasSwitch(ContentSwitches.RUN_LAYOUT_TEST)) { |
@@ -118,7 +119,13 @@ public class ContentShellActivity extends Activity { |
} |
private void finishInitialization(Bundle savedInstanceState) { |
- String shellUrl = ShellManager.DEFAULT_SHELL_URL; |
+ String shellUrl; |
+ if (!TextUtils.isEmpty(mStartupUrl)) { |
+ shellUrl = mStartupUrl; |
+ } else { |
+ shellUrl = ShellManager.DEFAULT_SHELL_URL; |
+ } |
+ |
if (savedInstanceState != null |
&& savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) { |
shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY); |