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

Side by Side Diff: components/cronet/android/org_chromium_net_UrlRequestContext.cc

Issue 230443005: Move cronet from //net into //components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to r262794 Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/android/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 7 #include "base/android/jni_registrar.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
11 #include "base/metrics/statistics_recorder.h" 11 #include "base/metrics/statistics_recorder.h"
12 #include "components/cronet/android/org_chromium_net_UrlRequest.h"
13 #include "components/cronet/android/url_request_context_peer.h"
14 #include "components/cronet/android/url_request_peer.h"
12 #include "jni/UrlRequestContext_jni.h" 15 #include "jni/UrlRequestContext_jni.h"
13 #include "net/android/net_jni_registrar.h" 16 #include "net/android/net_jni_registrar.h"
14 #include "net/cronet/android/org_chromium_net_UrlRequest.h"
15 #include "net/cronet/android/url_request_context_peer.h"
16 #include "net/cronet/android/url_request_peer.h"
17 17
18 // Version of this build of Chromium NET. 18 // Version of this build of Chromium NET.
19 #define CHROMIUM_NET_VERSION "1" 19 #define CHROMIUM_NET_VERSION "1"
20 20
21 namespace { 21 namespace {
22 22
23 const char kVersion[] = CHROMIUM_VERSION "/" CHROMIUM_NET_VERSION; 23 const char kVersion[] = CHROMIUM_VERSION "/" CHROMIUM_NET_VERSION;
24 24
25 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { 25 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
26 {"BaseAndroid", base::android::RegisterJni}, 26 {"BaseAndroid", base::android::RegisterJni},
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // Stops recording NetLog. 159 // Stops recording NetLog.
160 static void StopNetLog(JNIEnv* env, 160 static void StopNetLog(JNIEnv* env,
161 jobject jcaller, 161 jobject jcaller,
162 jlong urlRequestContextPeer) { 162 jlong urlRequestContextPeer) {
163 URLRequestContextPeer* peer = 163 URLRequestContextPeer* peer =
164 reinterpret_cast<URLRequestContextPeer*>(urlRequestContextPeer); 164 reinterpret_cast<URLRequestContextPeer*>(urlRequestContextPeer);
165 peer->StopNetLog(); 165 peer->StopNetLog();
166 } 166 }
167 167
168 } // namespace net 168 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698