| 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 881bfc0fe488378699dbba72edd7ddcad11bfac9..af13bbfe3d446b90957de44038eb1e67b5cbb59d 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,7 +42,6 @@
|
| private ShellManager mShellManager;
|
| private ActivityWindowAndroid mWindowAndroid;
|
| private Intent mLastSentIntent;
|
| - private String mStartupUrl;
|
|
|
| @Override
|
| @SuppressFBWarnings("DM_EXIT")
|
| @@ -82,9 +81,9 @@
|
| mWindowAndroid.setAnimationPlaceholderView(
|
| mShellManager.getContentViewRenderView().getSurfaceView());
|
|
|
| - mStartupUrl = getUrlFromIntent(getIntent());
|
| - if (!TextUtils.isEmpty(mStartupUrl)) {
|
| - mShellManager.setStartupUrl(Shell.sanitizeUrl(mStartupUrl));
|
| + String startupUrl = getUrlFromIntent(getIntent());
|
| + if (!TextUtils.isEmpty(startupUrl)) {
|
| + mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));
|
| }
|
|
|
| if (CommandLine.getInstance().hasSwitch(ContentSwitches.RUN_LAYOUT_TEST)) {
|
| @@ -119,13 +118,7 @@
|
| }
|
|
|
| private void finishInitialization(Bundle savedInstanceState) {
|
| - String shellUrl;
|
| - if (!TextUtils.isEmpty(mStartupUrl)) {
|
| - shellUrl = mStartupUrl;
|
| - } else {
|
| - shellUrl = ShellManager.DEFAULT_SHELL_URL;
|
| - }
|
| -
|
| + String shellUrl = ShellManager.DEFAULT_SHELL_URL;
|
| if (savedInstanceState != null
|
| && savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {
|
| shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);
|
|
|