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

Side by Side Diff: android_webview/native/aw_contents_client_bridge.cc

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "android_webview/native/aw_contents_client_bridge.h" 5 #include "android_webview/native/aw_contents_client_bridge.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 #include "jni/AwContentsClientBridge_jni.h" 13 #include "jni/AwContentsClientBridge_jni.h"
14 #include "net/base/x509_certificate.h" 14 #include "net/cert/x509_certificate.h"
15 15
16 using base::android::AttachCurrentThread; 16 using base::android::AttachCurrentThread;
17 using base::android::ConvertJavaStringToUTF16; 17 using base::android::ConvertJavaStringToUTF16;
18 using base::android::ConvertUTF8ToJavaString; 18 using base::android::ConvertUTF8ToJavaString;
19 using base::android::JavaRef; 19 using base::android::JavaRef;
20 using base::android::ScopedJavaLocalRef; 20 using base::android::ScopedJavaLocalRef;
21 using content::BrowserThread; 21 using content::BrowserThread;
22 22
23 namespace android_webview { 23 namespace android_webview {
24 24
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 82 }
83 callback->Run(proceed); 83 callback->Run(proceed);
84 pending_cert_error_callbacks_.Remove(id); 84 pending_cert_error_callbacks_.Remove(id);
85 } 85 }
86 86
87 bool RegisterAwContentsClientBridge(JNIEnv* env) { 87 bool RegisterAwContentsClientBridge(JNIEnv* env) {
88 return RegisterNativesImpl(env) >= 0; 88 return RegisterNativesImpl(env) >= 0;
89 } 89 }
90 90
91 } // namespace android_webview 91 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | android_webview/tools/third_party_files_whitelist.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698