Public glue layer plumbing for View#startActivityForResult

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

 // Copyright 2014 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 com.android.webview.chromium;
 
 import android.app.assist.AssistStructure.ViewNode;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Picture;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.net.http.SslCertificate;
 import android.os.Build;
@@ skipping 34 matching lines @@
 import org.chromium.android_webview.AwSettings;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content.browser.SmartClipProvider;
 import org.chromium.content_public.browser.AccessibilitySnapshotCallback;
 import org.chromium.content_public.browser.AccessibilitySnapshotNode;
 import org.chromium.content_public.browser.NavigationHistory;
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 /**
  * This class is the delegate to which WebViewProxy forwards all API calls.
@@ skipping 1666 matching lines @@
                 @Override
                 public void run() {
                     mAwContents.setLayoutParams(layoutParams);
                 }
             });
             return;
         }
         mAwContents.setLayoutParams(layoutParams);
     }
 
+    // Overrides WebViewProvider.ViewDelegate.onActivityResult (not in system api jar yet).

[sgurun-gerrit only, 2015/10/16 00:06:53]

add this to cleanup crbug.

[hush (inactive), 2015/10/20 23:16:09]

Done.

+    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+        if (checkNeedsPost()) {
+            mRunQueue.addTask(new Runnable() {
+                @Override
+                public void run() {
+                    onActivityResult(requestCode, resultCode, data);
+                }
+            });
+            return;
+        }
+        mAwContents.onActivityResult(requestCode, resultCode, data);
+    }
+
     @Override
     public boolean performLongClick() {
         // Return false unless the WebView is attached to a View with a parent
         return mWebView.getParent() != null ? mWebViewPrivate.super_performLongClick() : false;
     }
 
     @Override
     public void onConfigurationChanged(final Configuration newConfig) {
         if (checkNeedsPost()) {
             mRunQueue.addTask(new Runnable() {
@@ skipping 474 matching lines @@
         public void super_onConfigurationChanged(Configuration arg0) {
             // Intentional no-op
         }
 
         @Override
         public int super_getScrollBarStyle() {
             return mWebViewPrivate.super_getScrollBarStyle();
         }
 
         @Override
+        public void super_startActivityForResult(Intent intent, int requestCode) {
+            // TODO(hush): Use mWebViewPrivate.super_startActivityForResult
+            // after N release. crbug.com/543272
+            assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;

[sgurun-gerrit only, 2015/10/16 00:06:53]

nit: I don't think java asserts are functional. 

[Torne, 2015/10/16 12:49:40]

Yeah, don't use asserts, they are off by default but still compiled into the
code, so we get no runtime benefit and a binary size cost. :/

[hush (inactive), 2015/10/20 23:16:09]

Ok. I just deleted it.

+            try {
+                Method startActivityForResultMethod =
+                        View.class.getMethod("startActivityForResult", Intent.class, int.class);
+                startActivityForResultMethod.invoke(mWebView, intent, requestCode);
+            } catch (Exception e) {
+                throw new RuntimeException("Invalid reflection", e);
+            }
+        }
+
+        @Override
         public boolean awakenScrollBars() {
             mWebViewPrivate.awakenScrollBars(0);
             // TODO: modify the WebView.PrivateAccess to provide a return value.
             return true;
         }
 
         @Override
         public boolean super_awakenScrollBars(int arg0, boolean arg1) {
             return false;
         }
@@ skipping 35 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }