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_fixer/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" |
11 #include "url/gurl.h" | 11 #include "url/gurl.h" |
12 | 12 |
13 using base::android::ConvertJavaStringToUTF8; | 13 using base::android::ConvertJavaStringToUTF8; |
14 | 14 |
15 namespace { | 15 namespace { |
16 | 16 |
17 GURL ConvertJavaStringToGURL(JNIEnv*env, jstring url) { | 17 GURL ConvertJavaStringToGURL(JNIEnv*env, jstring url) { |
18 return url ? GURL(ConvertJavaStringToUTF8(env, url)) : GURL(); | 18 return url ? GURL(ConvertJavaStringToUTF8(env, url)) : GURL(); |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 if (gurl.is_empty()) | 73 if (gurl.is_empty()) |
74 return false; | 74 return false; |
75 return google_util::IsGoogleHomePageUrl(gurl); | 75 return google_util::IsGoogleHomePageUrl(gurl); |
76 } | 76 } |
77 | 77 |
78 static jstring FixupUrl(JNIEnv* env, | 78 static jstring FixupUrl(JNIEnv* env, |
79 jclass clazz, | 79 jclass clazz, |
80 jstring url, | 80 jstring url, |
81 jstring optional_desired_tld) { | 81 jstring optional_desired_tld) { |
82 DCHECK(url); | 82 DCHECK(url); |
83 GURL fixed_url = url_fixer::FixupURL( | 83 GURL fixed_url = url_formatter::FixupURL( |
84 base::android::ConvertJavaStringToUTF8(env, url), | 84 base::android::ConvertJavaStringToUTF8(env, url), |
85 optional_desired_tld | 85 optional_desired_tld |
86 ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld) | 86 ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld) |
87 : std::string()); | 87 : std::string()); |
88 | 88 |
89 return fixed_url.is_valid() ? | 89 return fixed_url.is_valid() ? |
90 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : | 90 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : |
91 nullptr; | 91 nullptr; |
92 } | 92 } |
93 | 93 |
94 // Register native methods | 94 // Register native methods |
95 bool RegisterUrlUtilities(JNIEnv* env) { | 95 bool RegisterUrlUtilities(JNIEnv* env) { |
96 return RegisterNativesImpl(env); | 96 return RegisterNativesImpl(env); |
97 } | 97 } |
OLD | NEW |