OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/android/offline_pages/offline_page_bridge.h" | 5 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 offline_page_model_->CheckForExternalFileDeletion(); | 227 offline_page_model_->CheckForExternalFileDeletion(); |
228 } | 228 } |
229 | 229 |
230 ScopedJavaLocalRef<jstring> OfflinePageBridge::GetOfflineUrlForOnlineUrl( | 230 ScopedJavaLocalRef<jstring> OfflinePageBridge::GetOfflineUrlForOnlineUrl( |
231 JNIEnv* env, | 231 JNIEnv* env, |
232 const JavaParamRef<jobject>& obj, | 232 const JavaParamRef<jobject>& obj, |
233 const JavaParamRef<jstring>& j_online_url) { | 233 const JavaParamRef<jstring>& j_online_url) { |
234 GURL online_url(ConvertJavaStringToUTF8(env, j_online_url)); | 234 GURL online_url(ConvertJavaStringToUTF8(env, j_online_url)); |
235 GURL offline_url = | 235 GURL offline_url = |
236 OfflinePageUtils::GetOfflineURLForOnlineURL(browser_context_, online_url); | 236 OfflinePageUtils::GetOfflineURLForOnlineURL(browser_context_, online_url); |
| 237 if (!offline_url.is_valid()) |
| 238 return ScopedJavaLocalRef<jstring>(); |
237 return ConvertUTF8ToJavaString(env, offline_url.spec()); | 239 return ConvertUTF8ToJavaString(env, offline_url.spec()); |
238 } | 240 } |
239 | 241 |
240 jboolean OfflinePageBridge::IsOfflinePageUrl( | 242 jboolean OfflinePageBridge::IsOfflinePageUrl( |
241 JNIEnv* env, | 243 JNIEnv* env, |
242 const JavaParamRef<jobject>& obj, | 244 const JavaParamRef<jobject>& obj, |
243 const JavaParamRef<jstring>& j_offline_url) { | 245 const JavaParamRef<jstring>& j_offline_url) { |
244 GURL offline_url(ConvertJavaStringToUTF8(env, j_offline_url)); | 246 GURL offline_url(ConvertJavaStringToUTF8(env, j_offline_url)); |
245 return OfflinePageUtils::IsOfflinePage(browser_context_, offline_url); | 247 return OfflinePageUtils::IsOfflinePage(browser_context_, offline_url); |
246 } | 248 } |
(...skipping 27 matching lines...) Expand all Loading... |
274 return reinterpret_cast<jlong>(new OfflinePageBridge( | 276 return reinterpret_cast<jlong>(new OfflinePageBridge( |
275 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); | 277 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); |
276 } | 278 } |
277 | 279 |
278 bool RegisterOfflinePageBridge(JNIEnv* env) { | 280 bool RegisterOfflinePageBridge(JNIEnv* env) { |
279 return RegisterNativesImpl(env); | 281 return RegisterNativesImpl(env); |
280 } | 282 } |
281 | 283 |
282 } // namespace android | 284 } // namespace android |
283 } // namespace offline_pages | 285 } // namespace offline_pages |
OLD | NEW |