ui: Android changes.

ui/android/java/src/org/chromium/ui/WindowAndroid.java

Index: ui/android/java/src/org/chromium/ui/WindowAndroid.java
diff --git a/ui/android/java/src/org/chromium/ui/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/WindowAndroid.java
deleted file mode 100644
index 20bb64c21c38cb5089a1af58be990aabb5d0121e..0000000000000000000000000000000000000000
--- a/ui/android/java/src/org/chromium/ui/WindowAndroid.java
+++ /dev/null
@@ -1,196 +0,0 @@
-// 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.ui;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.util.SparseArray;
-import android.widget.Toast;
-
-import java.util.HashMap;
-
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-
-/**
- * The window base class that has the minimum functionality.
- */
-@JNINamespace("ui")
-public class WindowAndroid {
-    private static final String TAG = "WindowAndroid";
-
-    // Native pointer to the c++ WindowAndroid object.
-    private long mNativeWindowAndroid = 0;
-
-    // A string used as a key to store intent errors in a bundle
-    static final String WINDOW_CALLBACK_ERRORS = "window_callback_errors";
-
-    protected Context mApplicationContext;
-    protected SparseArray<IntentCallback> mOutstandingIntents;
-    protected HashMap<Integer, String> mIntentErrors;
-
-    /**
-     * @param context, the application context..
-     */
-    public WindowAndroid(Context context) {
-        assert context == context.getApplicationContext();
-        mApplicationContext = context;
-        mOutstandingIntents = new SparseArray<IntentCallback>();
-        mIntentErrors = new HashMap<Integer, String>();
-    }
-
-    /**
-     * Shows an intent and returns the results to the callback object.
-     * @param intent The intent that needs to be showed.
-     * @param callback The object that will receive the results for the intent.
-     * @param errorId The ID of error string to be show if activity is paused before intent
-     *        results.
-     * @return Whether the intent was shown.
-     */
-    public boolean showIntent(Intent intent, IntentCallback callback, int errorId) {
-        Log.d(TAG, "Can't show intent as context is not an Activity: " + intent);
-        return false;
-    }
-
-    /**
-     * Displays an error message with a provided error message string.
-     * @param error The error message string to be displayed.
-     */
-    public void showError(String error) {
-        if (error != null) {
-            Toast.makeText(mApplicationContext, error, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    /**
-     * Displays an error message from the given resource id.
-     * @param resId The error message string's resource id.
-     */
-    public void showError(int resId) {
-        showError(mApplicationContext.getString(resId));
-    }
-
-    /**
-     * Displays an error message for a nonexistent callback.
-     * @param error The error message string to be displayed.
-     */
-    protected void showCallbackNonExistentError(String error) {
-        showError(error);
-    }
-
-    /**
-     * Broadcasts the given intent to all interested BroadcastReceivers.
-     */
-    public void sendBroadcast(Intent intent) {
-        mApplicationContext.sendBroadcast(intent);
-    }
-
-    /**
-     * TODO(nileshagrawal): Stop returning Activity Context crbug.com/233440.
-     * @return Activity context, it could be null. Note, in most cases, you probably
-     * just need Application Context returned by getApplicationContext().
-     * @see #getApplicationContext()
-     */
-    @Deprecated
-    public Context getContext() {
-        return null;
-    }
-
-    /**
-     * @return The application context for this activity.
-     */
-    public Context getApplicationContext() {
-        return mApplicationContext;
-    }
-
-    /**
-     * Saves the error messages that should be shown if any pending intents would return
-     * after the application has been put onPause.
-     * @param bundle The bundle to save the information in onPause
-     */
-    public void saveInstanceState(Bundle bundle) {
-        bundle.putSerializable(WINDOW_CALLBACK_ERRORS, mIntentErrors);
-    }
-
-    /**
-     * Restores the error messages that should be shown if any pending intents would return
-     * after the application has been put onPause.
-     * @param bundle The bundle to restore the information from onResume
-     */
-    public void restoreInstanceState(Bundle bundle) {
-        if (bundle == null) return;
-
-        Object errors = bundle.getSerializable(WINDOW_CALLBACK_ERRORS);
-        if (errors instanceof HashMap) {
-            @SuppressWarnings("unchecked")
-            HashMap<Integer, String> intentErrors = (HashMap<Integer, String>) errors;
-            mIntentErrors = intentErrors;
-        }
-    }
-
-    /**
-     * Responds to the intent result if the intent was created by the native window.
-     * @param requestCode Request code of the requested intent.
-     * @param resultCode Result code of the requested intent.
-     * @param data The data returned by the intent.
-     * @return Boolean value of whether the intent was started by the native window.
-     */
-    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
-        return false;
-    }
-
-    /**
-     * An interface that intent callback objects have to implement.
-     */
-    public interface IntentCallback {
-        /**
-         * Handles the data returned by the requested intent.
-         * @param window A window reference.
-         * @param resultCode Result code of the requested intent.
-         * @param contentResolver An instance of ContentResolver class for accessing returned data.
-         * @param data The data returned by the intent.
-         */
-        public void onIntentCompleted(WindowAndroid window, int resultCode,
-                ContentResolver contentResolver, Intent data);
-    }
-
-    /**
-     * Destroys the c++ WindowAndroid object if one has been created.
-     */
-    public void destroy() {
-        if (mNativeWindowAndroid != 0) {
-            nativeDestroy(mNativeWindowAndroid);
-            mNativeWindowAndroid = 0;
-        }
-    }
-
-    /**
-     * Returns a pointer to the c++ AndroidWindow object and calls the initializer if
-     * the object has not been previously initialized.
-     * @return A pointer to the c++ AndroidWindow.
-     */
-    public long getNativePointer() {
-        if (mNativeWindowAndroid == 0) {
-            mNativeWindowAndroid = nativeInit();
-        }
-        return mNativeWindowAndroid;
-    }
-
-    /**
-     * Returns a PNG-encoded screenshot of the the window region at (|windowX|,
-     * |windowY|) with the size |width| by |height| pixels.
-     */
-    @CalledByNative
-    public byte[] grabSnapshot(int windowX, int windowY, int width, int height) {
-        return null;
-    }
-
-    private native long nativeInit();
-    private native void nativeDestroy(long nativeWindowAndroid);
-
-}