| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/common/android/device_info.h" | 5 #include "content/common/android/device_info.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "jni/device_info_jni.h" | 10 #include "jni/DeviceInfo_jni.h" |
| 11 | 11 |
| 12 using base::android::AttachCurrentThread; | 12 using base::android::AttachCurrentThread; |
| 13 using base::android::ConvertJavaStringToUTF8; | 13 using base::android::ConvertJavaStringToUTF8; |
| 14 using base::android::ScopedJavaLocalRef; | 14 using base::android::ScopedJavaLocalRef; |
| 15 | 15 |
| 16 namespace content { | 16 namespace content { |
| 17 | 17 |
| 18 DeviceInfo::DeviceInfo() { | 18 DeviceInfo::DeviceInfo() { |
| 19 JNIEnv* env = AttachCurrentThread(); | 19 JNIEnv* env = AttachCurrentThread(); |
| 20 j_device_info_.Reset(Java_DeviceInfo_create(env, | 20 j_device_info_.Reset(Java_DeviceInfo_create(env, |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 ScopedJavaLocalRef<jstring> result = | 71 ScopedJavaLocalRef<jstring> result = |
| 72 Java_DeviceInfo_getNetworkCountryIso(env, j_device_info_.obj()); | 72 Java_DeviceInfo_getNetworkCountryIso(env, j_device_info_.obj()); |
| 73 return ConvertJavaStringToUTF8(result); | 73 return ConvertJavaStringToUTF8(result); |
| 74 } | 74 } |
| 75 | 75 |
| 76 bool RegisterDeviceInfo(JNIEnv* env) { | 76 bool RegisterDeviceInfo(JNIEnv* env) { |
| 77 return RegisterNativesImpl(env); | 77 return RegisterNativesImpl(env); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace content | 80 } // namespace content |
| OLD | NEW |