Adding NativeWindow base class with no activity.

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;
-import org.chromium.ui.gfx.NativeWindow;
+import org.chromium.ui.gfx.ActivityNativeWindow;
 
 /**
  * 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";
     public static final String DEFAULT_SHELL_URL = "http://www.google.com";
 
     private ShellManager mShellManager;
+    private ActivityNativeWindow mActivityNativeWindow;
 
     @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);
         waitForDebuggerIfNeeded();
 
         LibraryLoader.loadAndInitSync();
         initializeContentViewResources();
 
         setContentView(R.layout.content_shell_activity);
         mShellManager = (ShellManager) findViewById(R.id.shell_container);
-        mShellManager.setWindow(new NativeWindow(this));
+        mActivityNativeWindow = new ActivityNativeWindow(this);
+        mActivityNativeWindow.restoreInstanceState(savedInstanceState);
+        mShellManager.setWindow(mActivityNativeWindow);
 
         String startupUrl = getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(startupUrl)) {
             mShellManager.setStartupUrl(Shell.sanitizeUrl(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);
         }
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         Shell activeShell = getActiveShell();
         if (activeShell != null) {
             outState.putString(ACTIVE_SHELL_URL_KEY, activeShell.getContentView().getUrl());
         }
+
+        mActivityNativeWindow.saveInstanceState(outState);
     }
 
     private void waitForDebuggerIfNeeded() {
         if (CommandLine.getInstance().hasSwitch(CommandLine.WAIT_FOR_JAVA_DEBUGGER)) {
             Log.e(TAG, "Waiting for Java debugger to connect...");
             android.os.Debug.waitForDebugger();
             Log.e(TAG, "Java debugger connected. Resuming execution.");
         }
     }
 
@@ skipping 30 matching lines @@
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
         ContentView view = getActiveContentView();
         if (view != null) view.onActivityResume();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mActivityNativeWindow.onActivityResult(requestCode, resultCode, data);
+    }
+
     private static String getUrlFromIntent(Intent intent) {
         return intent != null ? intent.getDataString() : null;
     }
 
     /**
      * @return The {@link ShellManager} configured for the activity or null if it has not been
      *         created yet.
      */
     public ShellManager getShellManager() {
         return mShellManager;
@@ skipping 14 matching lines @@
         Shell shell = getActiveShell();
         return shell != null ? shell.getContentView() : 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;
         AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION = R.string.accessibility_content_view;
     }
 }