Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "components/url_formatter/url_formatter_android.h" | |
| 6 | |
| 7 #include <string> | |
| 8 | |
| 9 #include "base/android/jni_android.h" | |
| 10 #include "base/android/jni_string.h" | |
| 11 #include "components/url_formatter/elide_url.h" | |
| 12 #include "components/url_formatter/url_fixer.h" | |
| 13 #include "components/url_formatter/url_formatter.h" | |
| 14 #include "jni/UrlFormatter_jni.h" | |
| 15 #include "url/gurl.h" | |
| 16 | |
| 17 using base::android::ConvertJavaStringToUTF8; | |
|
Peter Kasting
2016/07/01 06:59:33
Nit: Avoid this; you already fully-qualify one use
| |
| 18 | |
| 19 namespace { | |
| 20 | |
| 21 GURL ConvertJavaStringToGURL(JNIEnv* env, jstring url) { | |
| 22 return url ? GURL(ConvertJavaStringToUTF8(env, url)) : GURL(); | |
| 23 } | |
| 24 | |
| 25 } // namespace | |
| 26 | |
| 27 namespace url_formatter { | |
| 28 | |
| 29 namespace android { | |
| 30 | |
| 31 static ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env, | |
|
Peter Kasting
2016/07/01 06:59:33
Where are any of these static functions exposed to
| |
| 32 const JavaParamRef<jclass>& clazz, | |
| 33 const JavaParamRef<jstring>& url) { | |
| 34 DCHECK(url); | |
| 35 GURL fixed_url = url_formatter::FixupURL( | |
| 36 base::android::ConvertJavaStringToUTF8(env, url), std::string()); | |
| 37 | |
| 38 return fixed_url.is_valid() | |
| 39 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()) | |
| 40 : ScopedJavaLocalRef<jstring>(); | |
| 41 } | |
| 42 | |
| 43 static ScopedJavaLocalRef<jstring> FormatUrlForDisplay( | |
| 44 JNIEnv* env, | |
| 45 const JavaParamRef<jclass>& clazz, | |
| 46 const JavaParamRef<jstring>& url) { | |
| 47 return base::android::ConvertUTF16ToJavaString( | |
| 48 env, url_formatter::FormatUrl(ConvertJavaStringToGURL(env, url))); | |
| 49 } | |
| 50 | |
| 51 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplay( | |
| 52 JNIEnv* env, | |
| 53 const JavaParamRef<jclass>& clazz, | |
| 54 const JavaParamRef<jstring>& url) { | |
| 55 return base::android::ConvertUTF16ToJavaString( | |
| 56 env, url_formatter::FormatUrlForSecurityDisplay( | |
| 57 ConvertJavaStringToGURL(env, url))); | |
| 58 } | |
| 59 | |
| 60 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme( | |
| 61 JNIEnv* env, | |
| 62 const JavaParamRef<jclass>& clazz, | |
| 63 const JavaParamRef<jstring>& url) { | |
| 64 return base::android::ConvertUTF16ToJavaString( | |
| 65 env, url_formatter::FormatUrlForSecurityDisplay( | |
| 66 ConvertJavaStringToGURL(env, url), | |
| 67 url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS)); | |
| 68 } | |
| 69 | |
| 70 bool RegisterUrlFormatter(JNIEnv* env) { | |
| 71 return RegisterNativesImpl(env); | |
| 72 } | |
| 73 | |
| 74 } // namespace android | |
| 75 | |
| 76 } // namespace url_formatter | |
| OLD | NEW |