| 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 "net/android/gurl_utils.h" | 5 #include "net/android/gurl_utils.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "googleurl/src/gurl.h" | |
| 9 #include "jni/GURLUtils_jni.h" | 8 #include "jni/GURLUtils_jni.h" |
| 9 #include "url/gurl.h" |
| 10 | 10 |
| 11 namespace net { | 11 namespace net { |
| 12 | 12 |
| 13 jstring GetOrigin(JNIEnv* env, jclass clazz, jstring url) { | 13 jstring GetOrigin(JNIEnv* env, jclass clazz, jstring url) { |
| 14 GURL host(base::android::ConvertJavaStringToUTF16(env, url)); | 14 GURL host(base::android::ConvertJavaStringToUTF16(env, url)); |
| 15 | 15 |
| 16 return base::android::ConvertUTF8ToJavaString(env, | 16 return base::android::ConvertUTF8ToJavaString(env, |
| 17 host.GetOrigin().spec()).Release(); | 17 host.GetOrigin().spec()).Release(); |
| 18 } | 18 } |
| 19 | 19 |
| 20 jstring GetScheme(JNIEnv* env, jclass clazz, jstring url) { | 20 jstring GetScheme(JNIEnv* env, jclass clazz, jstring url) { |
| 21 GURL host(base::android::ConvertJavaStringToUTF16(env, url)); | 21 GURL host(base::android::ConvertJavaStringToUTF16(env, url)); |
| 22 | 22 |
| 23 return base::android::ConvertUTF8ToJavaString(env, | 23 return base::android::ConvertUTF8ToJavaString(env, |
| 24 host.scheme()).Release(); | 24 host.scheme()).Release(); |
| 25 } | 25 } |
| 26 | 26 |
| 27 bool RegisterGURLUtils(JNIEnv* env) { | 27 bool RegisterGURLUtils(JNIEnv* env) { |
| 28 return RegisterNativesImpl(env); | 28 return RegisterNativesImpl(env); |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // net namespace | 31 } // net namespace |
| OLD | NEW |