| 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 "chrome/browser/google/google_util.h" | 7 #include "chrome/browser/google/google_util.h" |
| 8 #include "chrome/common/net/url_fixer_upper.h" | 8 #include "chrome/common/net/url_fixer_upper.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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 jstring desired_tld) { | 76 jstring desired_tld) { |
| 77 GURL fixed_url = URLFixerUpper::FixupURL( | 77 GURL fixed_url = URLFixerUpper::FixupURL( |
| 78 base::android::ConvertJavaStringToUTF8(env, url), | 78 base::android::ConvertJavaStringToUTF8(env, url), |
| 79 base::android::ConvertJavaStringToUTF8(env, desired_tld)); | 79 base::android::ConvertJavaStringToUTF8(env, desired_tld)); |
| 80 | 80 |
| 81 | 81 |
| 82 return fixed_url.is_valid() ? | 82 return fixed_url.is_valid() ? |
| 83 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : | 83 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : |
| 84 NULL; | 84 NULL; |
| 85 } | 85 } |
| 86 | |
| 87 // Register native methods | |
| 88 bool RegisterUrlUtilities(JNIEnv* env) { | |
| 89 return RegisterNativesImpl(env); | |
| 90 } | |
| OLD | NEW |