| 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 "components/google/core/browser/google_util.h" |
| 8 #include "components/url_fixer/url_fixer.h" | 8 #include "components/url_fixer/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 net::registry_controlled_domains::PrivateRegistryFilter GetRegistryFilter( | 17 net::registry_controlled_domains::PrivateRegistryFilter GetRegistryFilter( |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 return fixed_url.is_valid() ? | 81 return fixed_url.is_valid() ? |
| 82 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : | 82 base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() : |
| 83 NULL; | 83 NULL; |
| 84 } | 84 } |
| 85 | 85 |
| 86 // Register native methods | 86 // Register native methods |
| 87 bool RegisterUrlUtilities(JNIEnv* env) { | 87 bool RegisterUrlUtilities(JNIEnv* env) { |
| 88 return RegisterNativesImpl(env); | 88 return RegisterNativesImpl(env); |
| 89 } | 89 } |
| OLD | NEW |