| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "base/android/jni_android.h" | 5 #include "base/android/jni_android.h" |
| 6 #include "base/android/jni_string.h" | 6 #include "base/android/jni_string.h" |
| 7 #include "components/google/core/browser/google_util.h" | 7 #include "components/google/core/browser/google_util.h" |
| 8 #include "components/url_formatter/url_fixer.h" | 8 #include "components/url_formatter/url_fixer.h" |
| 9 #include "jni/UrlUtilities_jni.h" | 9 #include "jni/UrlUtilities_jni.h" |
| 10 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 10 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 net::registry_controlled_domains::PrivateRegistryFilter GetRegistryFilter( | 21 net::registry_controlled_domains::PrivateRegistryFilter GetRegistryFilter( |
| 22 jboolean include_private) { | 22 jboolean include_private) { |
| 23 return include_private | 23 return include_private |
| 24 ? net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES | 24 ? net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES |
| 25 : net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES; | 25 : net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES; |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace | 28 } // namespace |
| 29 | 29 |
| 30 static jboolean SameDomainOrHost(JNIEnv* env, | 30 static jboolean SameDomainOrHost(JNIEnv* env, |
| 31 jclass clazz, | 31 const JavaParamRef<jclass>& clazz, |
| 32 jstring url_1_str, | 32 const JavaParamRef<jstring>& url_1_str, |
| 33 jstring url_2_str, | 33 const JavaParamRef<jstring>& url_2_str, |
| 34 jboolean include_private) { | 34 jboolean include_private) { |
| 35 GURL url_1 = ConvertJavaStringToGURL(env, url_1_str); | 35 GURL url_1 = ConvertJavaStringToGURL(env, url_1_str); |
| 36 GURL url_2 = ConvertJavaStringToGURL(env, url_2_str); | 36 GURL url_2 = ConvertJavaStringToGURL(env, url_2_str); |
| 37 | 37 |
| 38 net::registry_controlled_domains::PrivateRegistryFilter filter = | 38 net::registry_controlled_domains::PrivateRegistryFilter filter = |
| 39 GetRegistryFilter(include_private); | 39 GetRegistryFilter(include_private); |
| 40 | 40 |
| 41 return net::registry_controlled_domains::SameDomainOrHost(url_1, | 41 return net::registry_controlled_domains::SameDomainOrHost(url_1, |
| 42 url_2, | 42 url_2, |
| 43 filter); | 43 filter); |
| 44 } | 44 } |
| 45 | 45 |
| 46 static ScopedJavaLocalRef<jstring> GetDomainAndRegistry( | 46 static ScopedJavaLocalRef<jstring> GetDomainAndRegistry( |
| 47 JNIEnv* env, | 47 JNIEnv* env, |
| 48 jclass clazz, | 48 const JavaParamRef<jclass>& clazz, |
| 49 jstring url, | 49 const JavaParamRef<jstring>& url, |
| 50 jboolean include_private) { | 50 jboolean include_private) { |
| 51 DCHECK(url); | 51 DCHECK(url); |
| 52 GURL gurl = ConvertJavaStringToGURL(env, url); | 52 GURL gurl = ConvertJavaStringToGURL(env, url); |
| 53 if (gurl.is_empty()) | 53 if (gurl.is_empty()) |
| 54 return ScopedJavaLocalRef<jstring>(); | 54 return ScopedJavaLocalRef<jstring>(); |
| 55 | 55 |
| 56 net::registry_controlled_domains::PrivateRegistryFilter filter = | 56 net::registry_controlled_domains::PrivateRegistryFilter filter = |
| 57 GetRegistryFilter(include_private); | 57 GetRegistryFilter(include_private); |
| 58 | 58 |
| 59 return base::android::ConvertUTF8ToJavaString( | 59 return base::android::ConvertUTF8ToJavaString( |
| 60 env, | 60 env, |
| 61 net::registry_controlled_domains::GetDomainAndRegistry(gurl, filter)); | 61 net::registry_controlled_domains::GetDomainAndRegistry(gurl, filter)); |
| 62 } | 62 } |
| 63 | 63 |
| 64 static jboolean IsGoogleSearchUrl(JNIEnv* env, jclass clazz, jstring url) { | 64 static jboolean IsGoogleSearchUrl(JNIEnv* env, |
| 65 const JavaParamRef<jclass>& clazz, |
| 66 const JavaParamRef<jstring>& url) { |
| 65 GURL gurl = ConvertJavaStringToGURL(env, url); | 67 GURL gurl = ConvertJavaStringToGURL(env, url); |
| 66 if (gurl.is_empty()) | 68 if (gurl.is_empty()) |
| 67 return false; | 69 return false; |
| 68 return google_util::IsGoogleSearchUrl(gurl); | 70 return google_util::IsGoogleSearchUrl(gurl); |
| 69 } | 71 } |
| 70 | 72 |
| 71 static jboolean IsGoogleHomePageUrl(JNIEnv* env, jclass clazz, jstring url) { | 73 static jboolean IsGoogleHomePageUrl(JNIEnv* env, |
| 74 const JavaParamRef<jclass>& clazz, |
| 75 const JavaParamRef<jstring>& url) { |
| 72 GURL gurl = ConvertJavaStringToGURL(env, url); | 76 GURL gurl = ConvertJavaStringToGURL(env, url); |
| 73 if (gurl.is_empty()) | 77 if (gurl.is_empty()) |
| 74 return false; | 78 return false; |
| 75 return google_util::IsGoogleHomePageUrl(gurl); | 79 return google_util::IsGoogleHomePageUrl(gurl); |
| 76 } | 80 } |
| 77 | 81 |
| 78 static ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env, | 82 static ScopedJavaLocalRef<jstring> FixupUrl( |
| 79 jclass clazz, | 83 JNIEnv* env, |
| 80 jstring url, | 84 const JavaParamRef<jclass>& clazz, |
| 81 jstring optional_desired_tld) { | 85 const JavaParamRef<jstring>& url, |
| 86 const JavaParamRef<jstring>& optional_desired_tld) { |
| 82 DCHECK(url); | 87 DCHECK(url); |
| 83 GURL fixed_url = url_formatter::FixupURL( | 88 GURL fixed_url = url_formatter::FixupURL( |
| 84 base::android::ConvertJavaStringToUTF8(env, url), | 89 base::android::ConvertJavaStringToUTF8(env, url), |
| 85 optional_desired_tld | 90 optional_desired_tld |
| 86 ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld) | 91 ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld) |
| 87 : std::string()); | 92 : std::string()); |
| 88 | 93 |
| 89 return fixed_url.is_valid() | 94 return fixed_url.is_valid() |
| 90 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()) | 95 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()) |
| 91 : ScopedJavaLocalRef<jstring>(); | 96 : ScopedJavaLocalRef<jstring>(); |
| 92 } | 97 } |
| 93 | 98 |
| 94 // Register native methods | 99 // Register native methods |
| 95 bool RegisterUrlUtilities(JNIEnv* env) { | 100 bool RegisterUrlUtilities(JNIEnv* env) { |
| 96 return RegisterNativesImpl(env); | 101 return RegisterNativesImpl(env); |
| 97 } | 102 } |
| OLD | NEW |