ContentShell rendering support on Android.

content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.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.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 
 import org.chromium.content.app.AppResource;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.common.CommandLine;
 
 /**
  * Activity for managing the Content Shell.
  */
 public class ContentShellActivity extends Activity {
 
     private static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line";
     private static final String TAG = ContentShellActivity.class.getName();
 
     private static final String ACTIVE_SHELL_URL_KEY = "activeUrl";
     private static final String DEFAULT_SHELL_URL = "http://www.google.com";

[Ted C, 2012/07/31 20:58:05]

drop the private here and use the same constant in ShellManager for the initial
value of the startup URL.

[no sievers, 2012/07/31 21:17:17]

Done.

 
     private ShellManager mShellManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Initializing the command line must occur before loading the library.
         if (!CommandLine.isInitialized()) CommandLine.initFromFile(COMMAND_LINE_FILE);
         String startupUrl = getUrlFromIntent(getIntent());
-        if (!TextUtils.isEmpty(startupUrl)) {
-            CommandLine.getInstance().appendSwitchesAndArguments(
-                    new String[] {Shell.sanitizeUrl(startupUrl)});
-        }
         waitForDebuggerIfNeeded();
 
         LibraryLoader.loadAndInitSync();
         initializeContentViewResources();
 
         setContentView(R.layout.content_shell_activity);
         mShellManager = (ShellManager) findViewById(R.id.shell_container);
+
+        if (!TextUtils.isEmpty(startupUrl)) {

[Ted C, 2012/07/31 20:58:05]

Move the declaration of startupUrl to right above this block as this isn't used
up there anymore.

[no sievers, 2012/07/31 21:17:17]

Done.

+            startupUrl = Shell.sanitizeUrl(startupUrl);

[Ted C, 2012/07/31 20:58:05]

no need to further modify startupUrl.

This can just be:
mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));

[no sievers, 2012/07/31 21:17:17]

Done.

+            mShellManager.setStartupUrl(startupUrl);
+        }
+
         if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {
             String shellUrl = DEFAULT_SHELL_URL;
             if (savedInstanceState != null
                     && savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {
                 shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);
             }
             mShellManager.launchShell(shellUrl);
         }
     }
 
@@ skipping 55 matching lines @@
      */
     public Shell getActiveShell() {
         return mShellManager != null ? mShellManager.getActiveShell() : null;
     }
 
     private void initializeContentViewResources() {
         AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius;
         AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay;
     }
 }