Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Side by Side Diff: components/url_formatter/url_formatter_android.cc

Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/url_formatter/url_formatter_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(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::JavaParamRef;
18 using base::android::ScopedJavaLocalRef;
19
20 namespace {
21
22 GURL ConvertJavaStringToGURL(JNIEnv* env, jstring url) {
23 return url ? GURL(base::android::ConvertJavaStringToUTF8(env, url)) : GURL();
24 }
25
26 } // namespace
27
28 namespace url_formatter {
29
30 namespace android {
31
32 static ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env,
33 const JavaParamRef<jclass>& clazz,
34 const JavaParamRef<jstring>& url) {
35 DCHECK(url);
36 GURL fixed_url = url_formatter::FixupURL(
37 base::android::ConvertJavaStringToUTF8(env, url), std::string());
38
39 return fixed_url.is_valid()
40 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec())
41 : ScopedJavaLocalRef<jstring>();
42 }
43
44 static ScopedJavaLocalRef<jstring> FormatUrlForDisplay(
45 JNIEnv* env,
46 const JavaParamRef<jclass>& clazz,
47 const JavaParamRef<jstring>& url) {
48 return base::android::ConvertUTF16ToJavaString(
49 env, url_formatter::FormatUrl(ConvertJavaStringToGURL(env, url)));
50 }
51
52 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplay(
53 JNIEnv* env,
54 const JavaParamRef<jclass>& clazz,
55 const JavaParamRef<jstring>& url) {
56 return base::android::ConvertUTF16ToJavaString(
57 env, url_formatter::FormatUrlForSecurityDisplay(
58 ConvertJavaStringToGURL(env, url)));
59 }
60
61 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme(
62 JNIEnv* env,
63 const JavaParamRef<jclass>& clazz,
64 const JavaParamRef<jstring>& url) {
65 return base::android::ConvertUTF16ToJavaString(
66 env, url_formatter::FormatUrlForSecurityDisplay(
67 ConvertJavaStringToGURL(env, url),
68 url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS));
69 }
70
71 bool RegisterUrlFormatterNatives(JNIEnv* env) {
72 return RegisterNativesImpl(env);
73 }
74
75 } // namespace android
76
77 } // namespace url_formatter
OLDNEW
« no previous file with comments | « components/url_formatter/url_formatter_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698