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

Side by Side Diff: components/dom_distiller/core/url_utils_android.cc

Issue 1312153003: jni_generator: Pass object parameters as JavaParamRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/dom_distiller/core/url_utils_android.h" 5 #include "components/dom_distiller/core/url_utils_android.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "components/dom_distiller/core/url_constants.h" 10 #include "components/dom_distiller/core/url_constants.h"
11 #include "components/dom_distiller/core/url_utils.h" 11 #include "components/dom_distiller/core/url_utils.h"
12 #include "jni/DomDistillerUrlUtils_jni.h" 12 #include "jni/DomDistillerUrlUtils_jni.h"
13 #include "net/base/url_util.h" 13 #include "net/base/url_util.h"
14 #include "url/gurl.h" 14 #include "url/gurl.h"
15 15
16 namespace dom_distiller { 16 namespace dom_distiller {
17 17
18 namespace url_utils { 18 namespace url_utils {
19 19
20 namespace android { 20 namespace android {
21 21
22 ScopedJavaLocalRef<jstring> GetDistillerViewUrlFromUrl(JNIEnv* env, 22 ScopedJavaLocalRef<jstring> GetDistillerViewUrlFromUrl(
23 jclass clazz, 23 JNIEnv* env,
24 jstring j_scheme, 24 const JavaParamRef<jclass>& clazz,
25 jstring j_url) { 25 const JavaParamRef<jstring>& j_scheme,
26 const JavaParamRef<jstring>& j_url) {
26 std::string scheme(base::android::ConvertJavaStringToUTF8(env, j_scheme)); 27 std::string scheme(base::android::ConvertJavaStringToUTF8(env, j_scheme));
27 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url)); 28 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
28 if (!url.is_valid()) { 29 if (!url.is_valid()) {
29 return ScopedJavaLocalRef<jstring>(); 30 return ScopedJavaLocalRef<jstring>();
30 } 31 }
31 GURL view_url = 32 GURL view_url =
32 dom_distiller::url_utils::GetDistillerViewUrlFromUrl(scheme, url); 33 dom_distiller::url_utils::GetDistillerViewUrlFromUrl(scheme, url);
33 if (!view_url.is_valid()) { 34 if (!view_url.is_valid()) {
34 return ScopedJavaLocalRef<jstring>(); 35 return ScopedJavaLocalRef<jstring>();
35 } 36 }
36 return base::android::ConvertUTF8ToJavaString(env, view_url.spec()); 37 return base::android::ConvertUTF8ToJavaString(env, view_url.spec());
37 } 38 }
38 39
39 ScopedJavaLocalRef<jstring> GetOriginalUrlFromDistillerUrl(JNIEnv* env, 40 ScopedJavaLocalRef<jstring> GetOriginalUrlFromDistillerUrl(
40 jclass clazz, 41 JNIEnv* env,
41 jstring j_url) { 42 const JavaParamRef<jclass>& clazz,
43 const JavaParamRef<jstring>& j_url) {
42 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url)); 44 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
43 if (!url.is_valid()) 45 if (!url.is_valid())
44 return ScopedJavaLocalRef<jstring>(); 46 return ScopedJavaLocalRef<jstring>();
45 47
46 GURL original_url = 48 GURL original_url =
47 dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(url); 49 dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(url);
48 if (!original_url.is_valid()) 50 if (!original_url.is_valid())
49 return ScopedJavaLocalRef<jstring>(); 51 return ScopedJavaLocalRef<jstring>();
50 52
51 return base::android::ConvertUTF8ToJavaString(env, original_url.spec()); 53 return base::android::ConvertUTF8ToJavaString(env, original_url.spec());
52 } 54 }
53 55
54 jboolean IsDistilledPage(JNIEnv* env, jclass clazz, jstring j_url) { 56 jboolean IsDistilledPage(JNIEnv* env,
57 const JavaParamRef<jclass>& clazz,
58 const JavaParamRef<jstring>& j_url) {
55 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url)); 59 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
56 return dom_distiller::url_utils::IsDistilledPage(url); 60 return dom_distiller::url_utils::IsDistilledPage(url);
57 } 61 }
58 62
59 jboolean IsUrlDistillable(JNIEnv* env, jclass clazz, jstring j_url) { 63 jboolean IsUrlDistillable(JNIEnv* env,
64 const JavaParamRef<jclass>& clazz,
65 const JavaParamRef<jstring>& j_url) {
60 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url)); 66 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
61 return dom_distiller::url_utils::IsUrlDistillable(url); 67 return dom_distiller::url_utils::IsUrlDistillable(url);
62 } 68 }
63 69
64 ScopedJavaLocalRef<jstring> GetIsDistillableJs(JNIEnv* env, jclass clazz) { 70 ScopedJavaLocalRef<jstring> GetIsDistillableJs(
71 JNIEnv* env,
72 const JavaParamRef<jclass>& clazz) {
65 return base::android::ConvertUTF8ToJavaString( 73 return base::android::ConvertUTF8ToJavaString(
66 env, dom_distiller::url_utils::GetIsDistillableJs()); 74 env, dom_distiller::url_utils::GetIsDistillableJs());
67 } 75 }
68 76
69 ScopedJavaLocalRef<jstring> GetValueForKeyInUrl(JNIEnv* env, 77 ScopedJavaLocalRef<jstring> GetValueForKeyInUrl(
70 jclass clazz, 78 JNIEnv* env,
71 jstring j_url, 79 const JavaParamRef<jclass>& clazz,
72 jstring j_key) { 80 const JavaParamRef<jstring>& j_url,
81 const JavaParamRef<jstring>& j_key) {
73 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url)); 82 GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
74 std::string key = base::android::ConvertJavaStringToUTF8(env, j_key); 83 std::string key = base::android::ConvertJavaStringToUTF8(env, j_key);
75 return base::android::ConvertUTF8ToJavaString( 84 return base::android::ConvertUTF8ToJavaString(
76 env, dom_distiller::url_utils::GetValueForKeyInUrl(url, key)); 85 env, dom_distiller::url_utils::GetValueForKeyInUrl(url, key));
77 } 86 }
78 87
79 bool RegisterUrlUtils(JNIEnv* env) { return RegisterNativesImpl(env); } 88 bool RegisterUrlUtils(JNIEnv* env) { return RegisterNativesImpl(env); }
80 89
81 } // namespace android 90 } // namespace android
82 91
83 } // namespace url_utils 92 } // namespace url_utils
84 93
85 } // namespace dom_distiller 94 } // namespace dom_distiller
OLDNEW
« no previous file with comments | « components/dom_distiller/core/distilled_page_prefs_android.cc ('k') | components/safe_json/json_sanitizer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698