Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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 "components/cronet/android/cronet_library_loader.h" | 5 #include "components/cronet/android/cronet_library_loader.h" | 
| 6 | 6 | 
| 7 #include <jni.h> | 7 #include <jni.h> | 
| 8 | 8 | 
| 9 #include "base/android/base_jni_registrar.h" | 9 #include "base/android/base_jni_registrar.h" | 
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" | 
| 11 #include "base/android/jni_registrar.h" | 11 #include "base/android/jni_registrar.h" | 
| 12 #include "base/at_exit.h" | 12 #include "base/at_exit.h" | 
| 13 #include "base/logging.h" | 13 #include "base/logging.h" | 
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" | 
| 15 #include "components/cronet/android/chromium_url_request.h" | 15 #include "components/cronet/android/chromium_url_request.h" | 
| 16 #include "components/cronet/android/chromium_url_request_context.h" | 16 #include "components/cronet/android/chromium_url_request_context.h" | 
| 17 #include "components/cronet/android/cronet_histogram_manager.h" | 17 #include "components/cronet/android/cronet_histogram_manager.h" | 
| 18 #include "components/cronet/android/cronet_upload_data_stream.h" | |
| 18 #include "components/cronet/android/cronet_url_request.h" | 19 #include "components/cronet/android/cronet_url_request.h" | 
| 19 #include "components/cronet/android/cronet_url_request_context.h" | 20 #include "components/cronet/android/cronet_url_request_context.h" | 
| 20 #include "jni/CronetLibraryLoader_jni.h" | 21 #include "jni/CronetLibraryLoader_jni.h" | 
| 21 #include "net/android/net_jni_registrar.h" | 22 #include "net/android/net_jni_registrar.h" | 
| 22 #include "net/android/network_change_notifier_factory_android.h" | 23 #include "net/android/network_change_notifier_factory_android.h" | 
| 23 #include "net/base/network_change_notifier.h" | 24 #include "net/base/network_change_notifier.h" | 
| 24 #include "url/android/url_jni_registrar.h" | 25 #include "url/android/url_jni_registrar.h" | 
| 25 #include "url/url_util.h" | 26 #include "url/url_util.h" | 
| 26 | 27 | 
| 27 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 28 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 
| 28 #include "base/i18n/icu_util.h" | 29 #include "base/i18n/icu_util.h" | 
| 29 #endif | 30 #endif | 
| 30 | 31 | 
| 31 namespace cronet { | 32 namespace cronet { | 
| 32 namespace { | 33 namespace { | 
| 33 | 34 | 
| 34 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 35 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 
| 35 {"BaseAndroid", base::android::RegisterJni}, | 36 {"BaseAndroid", base::android::RegisterJni}, | 
| 36 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, | 37 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, | 
| 37 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, | 38 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, | 
| 38 {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, | 39 {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, | 
| 39 {"CronetLibraryLoader", RegisterNativesImpl}, | 40 {"CronetLibraryLoader", RegisterNativesImpl}, | 
| 40 {"CronetUrlRequest", CronetUrlRequestRegisterJni}, | 41 {"CronetUrlRequest", CronetUrlRequestRegisterJni}, | 
| 41 {"CronetUrlRequestContext", CronetUrlRequestContextRegisterJni}, | 42 {"CronetUrlRequestContext", CronetUrlRequestContextRegisterJni}, | 
| 43 {"CronetUploadDataStream", CronetUploadDataStreamRegisterJni}, | |
| 
 
mef
2015/02/11 20:04:26
nit: Upload should go above Url.
 
xunjieli
2015/02/11 20:09:49
Done.
 
 | |
| 42 {"NetAndroid", net::android::RegisterJni}, | 44 {"NetAndroid", net::android::RegisterJni}, | 
| 43 {"UrlAndroid", url::android::RegisterJni}, | 45 {"UrlAndroid", url::android::RegisterJni}, | 
| 44 }; | 46 }; | 
| 45 | 47 | 
| 46 base::AtExitManager* g_at_exit_manager = NULL; | 48 base::AtExitManager* g_at_exit_manager = NULL; | 
| 47 // MessageLoop on the main thread, which is where objects that receive Java | 49 // MessageLoop on the main thread, which is where objects that receive Java | 
| 48 // notifications generally live. | 50 // notifications generally live. | 
| 49 base::MessageLoop* g_main_message_loop = nullptr; | 51 base::MessageLoop* g_main_message_loop = nullptr; | 
| 50 | 52 | 
| 51 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; | 53 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 DCHECK(!g_main_message_loop); | 95 DCHECK(!g_main_message_loop); | 
| 94 g_main_message_loop = new base::MessageLoopForUI(); | 96 g_main_message_loop = new base::MessageLoopForUI(); | 
| 95 base::MessageLoopForUI::current()->Start(); | 97 base::MessageLoopForUI::current()->Start(); | 
| 96 DCHECK(!g_network_change_notifier); | 98 DCHECK(!g_network_change_notifier); | 
| 97 net::NetworkChangeNotifier::SetFactory( | 99 net::NetworkChangeNotifier::SetFactory( | 
| 98 new net::NetworkChangeNotifierFactoryAndroid()); | 100 new net::NetworkChangeNotifierFactoryAndroid()); | 
| 99 g_network_change_notifier = net::NetworkChangeNotifier::Create(); | 101 g_network_change_notifier = net::NetworkChangeNotifier::Create(); | 
| 100 } | 102 } | 
| 101 | 103 | 
| 102 } // namespace cronet | 104 } // namespace cronet | 
| OLD | NEW |