Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

Issue 1263053002: Move JNI annotations to annotations package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview; 5 package org.chromium.android_webview;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.net.http.SslCertificate; 8 import android.net.http.SslCertificate;
9 import android.net.http.SslError; 9 import android.net.http.SslError;
10 import android.util.Log; 10 import android.util.Log;
11 import android.webkit.ValueCallback; 11 import android.webkit.ValueCallback;
12 12
13 import org.chromium.base.CalledByNative;
14 import org.chromium.base.JNINamespace;
15 import org.chromium.base.ThreadUtils; 13 import org.chromium.base.ThreadUtils;
14 import org.chromium.base.annotations.CalledByNative;
15 import org.chromium.base.annotations.JNINamespace;
16 import org.chromium.net.AndroidPrivateKey; 16 import org.chromium.net.AndroidPrivateKey;
17 import org.chromium.net.DefaultAndroidKeyStore; 17 import org.chromium.net.DefaultAndroidKeyStore;
18 18
19 import java.security.Principal; 19 import java.security.Principal;
20 import java.security.PrivateKey; 20 import java.security.PrivateKey;
21 import java.security.cert.CertificateEncodingException; 21 import java.security.cert.CertificateEncodingException;
22 import java.security.cert.X509Certificate; 22 import java.security.cert.X509Certificate;
23 23
24 import javax.security.auth.x500.X500Principal; 24 import javax.security.auth.x500.X500Principal;
25 25
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 //-------------------------------------------------------------------------- ------------------ 274 //-------------------------------------------------------------------------- ------------------
275 private native void nativeProceedSslError(long nativeAwContentsClientBridge, boolean proceed, 275 private native void nativeProceedSslError(long nativeAwContentsClientBridge, boolean proceed,
276 int id); 276 int id);
277 private native void nativeProvideClientCertificateResponse(long nativeAwCont entsClientBridge, 277 private native void nativeProvideClientCertificateResponse(long nativeAwCont entsClientBridge,
278 int id, byte[][] certChain, AndroidPrivateKey androidKey); 278 int id, byte[][] certChain, AndroidPrivateKey androidKey);
279 279
280 private native void nativeConfirmJsResult(long nativeAwContentsClientBridge, int id, 280 private native void nativeConfirmJsResult(long nativeAwContentsClientBridge, int id,
281 String prompt); 281 String prompt);
282 private native void nativeCancelJsResult(long nativeAwContentsClientBridge, int id); 282 private native void nativeCancelJsResult(long nativeAwContentsClientBridge, int id);
283 } 283 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698