| OLD | NEW |
|---|
| 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 "url/android/url_jni_registrar.h" | 5 #include "url/android/url_jni_registrar.h" |
| 6 #include "url/features.h" |
| 6 | 7 |
| 7 #ifdef USE_ICU_ALTERNATIVES_ON_ANDROID | 8 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) |
| 8 #include "url/url_canon_icu_alternatives_android.h" | 9 #include "url/url_canon_icu_alternatives_android.h" |
| 9 #endif | 10 #endif |
| 10 | 11 |
| 11 namespace url { | 12 namespace url { |
| 12 namespace android { | 13 namespace android { |
| 13 | 14 |
| 14 bool RegisterJni(JNIEnv* env) { | 15 bool RegisterJni(JNIEnv* env) { |
| 15 #ifdef USE_ICU_ALTERNATIVES_ON_ANDROID | 16 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) |
| 16 return RegisterIcuAlternativesJni(env); | 17 return RegisterIcuAlternativesJni(env); |
| 17 #endif | 18 #endif |
| 18 | 19 |
| 19 // Do nothing if USE_ICU_ALTERNATIVES_ON_ANDROID is not defined. | 20 // Do nothing if USE_PLATFORM_ICU_ALTERNATIVES is false. |
| 20 return true; | 21 return true; |
| 21 } | 22 } |
| 22 | 23 |
| 23 } // namespace android | 24 } // namespace android |
| 24 } // namespace url | 25 } // namespace url |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1839803002:
Remove net & url small, iOS ICU alternatives, unit tests. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master