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

Side by Side Diff: chrome/browser/android/offline_pages/offline_page_bridge.cc

Issue 2284933002: Remove OfflineURL from offline page (Closed)
Patch Set: Add comment per feedback Created 4 years, 2 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 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 <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void ToJavaOfflinePageList(JNIEnv* env, 51 void ToJavaOfflinePageList(JNIEnv* env,
52 jobject j_result_obj, 52 jobject j_result_obj,
53 const std::vector<OfflinePageItem>& offline_pages) { 53 const std::vector<OfflinePageItem>& offline_pages) {
54 for (const OfflinePageItem& offline_page : offline_pages) { 54 for (const OfflinePageItem& offline_page : offline_pages) {
55 Java_OfflinePageBridge_createOfflinePageAndAddToList( 55 Java_OfflinePageBridge_createOfflinePageAndAddToList(
56 env, j_result_obj, 56 env, j_result_obj,
57 ConvertUTF8ToJavaString(env, offline_page.url.spec()), 57 ConvertUTF8ToJavaString(env, offline_page.url.spec()),
58 offline_page.offline_id, 58 offline_page.offline_id,
59 ConvertUTF8ToJavaString(env, offline_page.client_id.name_space), 59 ConvertUTF8ToJavaString(env, offline_page.client_id.name_space),
60 ConvertUTF8ToJavaString(env, offline_page.client_id.id), 60 ConvertUTF8ToJavaString(env, offline_page.client_id.id),
61 ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()),
62 ConvertUTF8ToJavaString(env, offline_page.file_path.value()), 61 ConvertUTF8ToJavaString(env, offline_page.file_path.value()),
63 offline_page.file_size, offline_page.creation_time.ToJavaTime(), 62 offline_page.file_size, offline_page.creation_time.ToJavaTime(),
64 offline_page.access_count, offline_page.last_access_time.ToJavaTime()); 63 offline_page.access_count, offline_page.last_access_time.ToJavaTime());
65 } 64 }
66 } 65 }
67 66
68 ScopedJavaLocalRef<jobject> ToJavaOfflinePageItem( 67 ScopedJavaLocalRef<jobject> ToJavaOfflinePageItem(
69 JNIEnv* env, 68 JNIEnv* env,
70 const OfflinePageItem& offline_page) { 69 const OfflinePageItem& offline_page) {
71 return Java_OfflinePageBridge_createOfflinePageItem( 70 return Java_OfflinePageBridge_createOfflinePageItem(
72 env, ConvertUTF8ToJavaString(env, offline_page.url.spec()), 71 env, ConvertUTF8ToJavaString(env, offline_page.url.spec()),
73 offline_page.offline_id, 72 offline_page.offline_id,
74 ConvertUTF8ToJavaString(env, offline_page.client_id.name_space), 73 ConvertUTF8ToJavaString(env, offline_page.client_id.name_space),
75 ConvertUTF8ToJavaString(env, offline_page.client_id.id), 74 ConvertUTF8ToJavaString(env, offline_page.client_id.id),
76 ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()),
77 ConvertUTF8ToJavaString(env, offline_page.file_path.value()), 75 ConvertUTF8ToJavaString(env, offline_page.file_path.value()),
78 offline_page.file_size, offline_page.creation_time.ToJavaTime(), 76 offline_page.file_size, offline_page.creation_time.ToJavaTime(),
79 offline_page.access_count, offline_page.last_access_time.ToJavaTime()); 77 offline_page.access_count, offline_page.last_access_time.ToJavaTime());
80 } 78 }
81 79
82 void CheckPagesExistOfflineCallback( 80 void CheckPagesExistOfflineCallback(
83 const ScopedJavaGlobalRef<jobject>& j_callback_obj, 81 const ScopedJavaGlobalRef<jobject>& j_callback_obj,
84 const OfflinePageModel::CheckPagesExistOfflineResult& offline_pages) { 82 const OfflinePageModel::CheckPagesExistOfflineResult& offline_pages) {
85 JNIEnv* env = base::android::AttachCurrentThread(); 83 JNIEnv* env = base::android::AttachCurrentThread();
86 84
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 ScopedJavaGlobalRef<jobject> j_callback_ref; 359 ScopedJavaGlobalRef<jobject> j_callback_ref;
362 j_callback_ref.Reset(env, j_callback_obj); 360 j_callback_ref.Reset(env, j_callback_obj);
363 361
364 OfflinePageUtils::SelectPageForOnlineURL( 362 OfflinePageUtils::SelectPageForOnlineURL(
365 browser_context_, 363 browser_context_,
366 GURL(ConvertJavaStringToUTF8(env, j_online_url)), 364 GURL(ConvertJavaStringToUTF8(env, j_online_url)),
367 tab_id, 365 tab_id,
368 base::Bind(&SingleOfflinePageItemCallback, j_callback_ref)); 366 base::Bind(&SingleOfflinePageItemCallback, j_callback_ref));
369 } 367 }
370 368
371 void OfflinePageBridge::GetPageByOfflineUrl(
372 JNIEnv* env,
373 const JavaParamRef<jobject>& obj,
374 const JavaParamRef<jstring>& j_offline_url,
375 const JavaParamRef<jobject>& j_callback_obj) {
376 DCHECK(j_callback_obj);
377
378 ScopedJavaGlobalRef<jobject> j_callback_ref;
379 j_callback_ref.Reset(env, j_callback_obj);
380
381 offline_page_model_->GetPageByOfflineURL(
382 GURL(ConvertJavaStringToUTF8(env, j_offline_url)),
383 base::Bind(&SingleOfflinePageItemCallback, j_callback_ref));
384 }
385
386 void OfflinePageBridge::SavePage( 369 void OfflinePageBridge::SavePage(
387 JNIEnv* env, 370 JNIEnv* env,
388 const JavaParamRef<jobject>& obj, 371 const JavaParamRef<jobject>& obj,
389 const JavaParamRef<jobject>& j_callback_obj, 372 const JavaParamRef<jobject>& j_callback_obj,
390 const JavaParamRef<jobject>& j_web_contents, 373 const JavaParamRef<jobject>& j_web_contents,
391 const JavaParamRef<jstring>& j_namespace, 374 const JavaParamRef<jstring>& j_namespace,
392 const JavaParamRef<jstring>& j_client_id) { 375 const JavaParamRef<jstring>& j_client_id) {
393 DCHECK(j_callback_obj); 376 DCHECK(j_callback_obj);
394 DCHECK(j_web_contents); 377 DCHECK(j_web_contents);
395 378
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 env, ConvertUTF8ToJavaString(env, client_id.name_space), 523 env, ConvertUTF8ToJavaString(env, client_id.name_space),
541 ConvertUTF8ToJavaString(env, client_id.id)); 524 ConvertUTF8ToJavaString(env, client_id.id));
542 } 525 }
543 526
544 bool RegisterOfflinePageBridge(JNIEnv* env) { 527 bool RegisterOfflinePageBridge(JNIEnv* env) {
545 return RegisterNativesImpl(env); 528 return RegisterNativesImpl(env);
546 } 529 }
547 530
548 } // namespace android 531 } // namespace android
549 } // namespace offline_pages 532 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698