Fix TODOs related to SDK 24

ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java

 // Copyright 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.base;
 
+import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.ImageView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
 import java.net.URISyntaxException;
 
 /**
  * Class to acquire, position, and remove anchor views from the implementing View.
  */
 @JNINamespace("ui")
 public abstract class ViewAndroidDelegate {
     private static final String TAG = "ViewAndroidDelegate";
-
-    // TODO(hush): use View#DRAG_FLAG_GLOBAL when Chromium starts to build with API 24.
-    private static final int DRAG_FLAG_GLOBAL = 1 << 8;
-
     private static final String GEO_SCHEME = "geo";
     private static final String TEL_SCHEME = "tel";
     private static final String MAILTO_SCHEME = "mailto";
 
     /**
      * @return An anchor view that can be used to anchor decoration views like Autofill popup.
      */
     @CalledByNative
     public View acquireView() {
         ViewGroup containerView = getContainerView();
@@ skipping 45 matching lines @@
         lp.topMargin = topMargin;
         view.setLayoutParams(lp);
     }
 
     /**
      * Drag the text out of current view.
      * @param text The dragged text.
      * @param shadowImage The shadow image for the dragged text.
      */
     @SuppressWarnings("deprecation")
-    // TODO(hush): uncomment below when we build with API 24.
-    // @TargetApi(Build.VERSION_CODES.N)
+    @TargetApi(Build.VERSION_CODES.N)
     @CalledByNative
     private boolean startDragAndDrop(String text, Bitmap shadowImage) {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) return false;
 
         ViewGroup containerView = getContainerView();
         if (containerView == null) return false;
 
         ImageView imageView = new ImageView(containerView.getContext());
         imageView.setImageBitmap(shadowImage);
         imageView.layout(0, 0, shadowImage.getWidth(), shadowImage.getHeight());
 
-        // TODO(hush): use View#startDragAndDrop when Chromium starts to build with API 24.
-        return containerView.startDrag(ClipData.newPlainText(null, text),
-                new View.DragShadowBuilder(imageView), null, DRAG_FLAG_GLOBAL);
+        return containerView.startDragAndDrop(ClipData.newPlainText(null, text),
+                new View.DragShadowBuilder(imageView), null, View.DRAG_FLAG_GLOBAL);
     }
 
     /**
      * Called whenever the background color of the page changes as notified by Blink.
      * @param color The new ARGB color of the page background.
      */
     @CalledByNative
     public void onBackgroundColorChanged(int color) {}
 
     /**
@@ skipping 61 matching lines @@
                 return this;
             }
 
             @Override
             public ViewGroup getContainerView() {
                 return mContainerView;
             }
         }.init(containerView);
     }
 }