commit bac0a5dbface8aa7ce8bd0769daa1fc8eec5e8b2
author ctzsm <ctzsm@chromium.org> Wed Mar 08 02:16:02 2017
committer Commit bot <commit-bot@chromium.org> Wed Mar 08 02:16:02 2017
tree 843fe89161a1c2cc0e012dbc8311c51a1ab0e1a1
parent 880468892380e46c69fca19f972113c58518134b

Fix TODOs related to SDK 24

Originally from Issue 2427543003 written by hush

BUG=546762, 543272

Review-Url: https://codereview.chromium.org/2738663003
Cr-Original-Commit-Position: refs/heads/master@{#455347}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 299bf5a2daf2784c7cdd2917483733e2262efb55

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

diff --git a/java/src/com/android/webview/chromium/WebViewChromium.java b/java/src/com/android/webview/chromium/WebViewChromium.java
index 0ea0849..99dd3fa 100644
--- a/java/src/com/android/webview/chromium/WebViewChromium.java
+++ b/java/src/com/android/webview/chromium/WebViewChromium.java
@@ -63,7 +63,6 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
@@ -1730,8 +1729,7 @@
         mAwContents.onConfigurationChanged(newConfig);
     }
 
-    //TODO(hush): add override after release.
-    //@Override
+    @Override
     public boolean onDragEvent(final DragEvent event) {
         mFactory.startYourEngines(false);
         if (checkNeedsPost()) {
@@ -2213,15 +2211,7 @@
 
         @Override
         public void super_startActivityForResult(Intent intent, int requestCode) {
-            // TODO(hush): Use mWebViewPrivate.super_startActivityForResult
-            // after N release. crbug.com/543272.
-            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);
-            }
+            mWebViewPrivate.super_startActivityForResult(intent, requestCode);
         }
 
         @Override