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

Side by Side Diff: chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/downloads/offline_page_download_b ridge.h" 5 #include "chrome/browser/android/offline_pages/downloads/offline_page_download_b ridge.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
(...skipping 22 matching lines...) Expand all
33 namespace android { 33 namespace android {
34 34
35 namespace { 35 namespace {
36 36
37 void ToJavaOfflinePageDownloadItemList( 37 void ToJavaOfflinePageDownloadItemList(
38 JNIEnv* env, 38 JNIEnv* env,
39 jobject j_result_obj, 39 jobject j_result_obj,
40 const std::vector<const DownloadUIItem*>& items) { 40 const std::vector<const DownloadUIItem*>& items) {
41 for (const auto item : items) { 41 for (const auto item : items) {
42 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList( 42 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList(
43 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid).obj(), 43 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid),
44 ConvertUTF8ToJavaString(env, item->url.spec()).obj(), 44 ConvertUTF8ToJavaString(env, item->url.spec()),
45 ConvertUTF8ToJavaString(env, item->target_path.value()).obj(), 45 ConvertUTF8ToJavaString(env, item->target_path.value()),
46 item->start_time.ToJavaTime(), item->total_bytes); 46 item->start_time.ToJavaTime(), item->total_bytes);
47 } 47 }
48 } 48 }
49 49
50 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem( 50 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem(
51 JNIEnv* env, 51 JNIEnv* env,
52 const DownloadUIItem& item) { 52 const DownloadUIItem& item) {
53 return Java_OfflinePageDownloadBridge_createDownloadItem( 53 return Java_OfflinePageDownloadBridge_createDownloadItem(
54 env, ConvertUTF8ToJavaString(env, item.guid).obj(), 54 env, ConvertUTF8ToJavaString(env, item.guid),
55 ConvertUTF8ToJavaString(env, item.url.spec()).obj(), 55 ConvertUTF8ToJavaString(env, item.url.spec()),
56 ConvertUTF8ToJavaString(env, item.target_path.value()).obj(), 56 ConvertUTF8ToJavaString(env, item.target_path.value()),
57 item.start_time.ToJavaTime(), item.total_bytes); 57 item.start_time.ToJavaTime(), item.total_bytes);
58 } 58 }
59 } // namespace 59 } // namespace
60 60
61 OfflinePageDownloadBridge::OfflinePageDownloadBridge( 61 OfflinePageDownloadBridge::OfflinePageDownloadBridge(
62 JNIEnv* env, 62 JNIEnv* env,
63 const JavaParamRef<jobject>& obj, 63 const JavaParamRef<jobject>& obj,
64 DownloadUIAdapter* download_ui_adapter) 64 DownloadUIAdapter* download_ui_adapter)
65 : weak_java_ref_(env, obj), 65 : weak_java_ref_(env, obj),
66 download_ui_adapter_(download_ui_adapter), 66 download_ui_adapter_(download_ui_adapter),
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 url, client_id, std::move(archiver), 151 url, client_id, std::move(archiver),
152 base::Bind(&OfflinePageDownloadBridge::SavePageCallback, 152 base::Bind(&OfflinePageDownloadBridge::SavePageCallback,
153 weak_ptr_factory_.GetWeakPtr())); 153 weak_ptr_factory_.GetWeakPtr()));
154 } 154 }
155 155
156 void OfflinePageDownloadBridge::ItemsLoaded() { 156 void OfflinePageDownloadBridge::ItemsLoaded() {
157 JNIEnv* env = AttachCurrentThread(); 157 JNIEnv* env = AttachCurrentThread();
158 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); 158 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
159 if (obj.is_null()) 159 if (obj.is_null())
160 return; 160 return;
161 Java_OfflinePageDownloadBridge_downloadItemsLoaded(env, obj.obj()); 161 Java_OfflinePageDownloadBridge_downloadItemsLoaded(env, obj);
162 } 162 }
163 163
164 void OfflinePageDownloadBridge::ItemAdded(const DownloadUIItem& item) { 164 void OfflinePageDownloadBridge::ItemAdded(const DownloadUIItem& item) {
165 JNIEnv* env = AttachCurrentThread(); 165 JNIEnv* env = AttachCurrentThread();
166 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); 166 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
167 if (obj.is_null()) 167 if (obj.is_null())
168 return; 168 return;
169 Java_OfflinePageDownloadBridge_downloadItemAdded( 169 Java_OfflinePageDownloadBridge_downloadItemAdded(
170 env, obj.obj(), ToJavaOfflinePageDownloadItem(env, item).obj()); 170 env, obj, ToJavaOfflinePageDownloadItem(env, item));
171 } 171 }
172 172
173 void OfflinePageDownloadBridge::ItemDeleted(const std::string& guid) { 173 void OfflinePageDownloadBridge::ItemDeleted(const std::string& guid) {
174 JNIEnv* env = AttachCurrentThread(); 174 JNIEnv* env = AttachCurrentThread();
175 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); 175 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
176 if (obj.is_null()) 176 if (obj.is_null())
177 return; 177 return;
178 Java_OfflinePageDownloadBridge_downloadItemDeleted( 178 Java_OfflinePageDownloadBridge_downloadItemDeleted(
179 env, obj.obj(), ConvertUTF8ToJavaString(env, guid).obj()); 179 env, obj, ConvertUTF8ToJavaString(env, guid));
180 } 180 }
181 181
182 void OfflinePageDownloadBridge::ItemUpdated(const DownloadUIItem& item) { 182 void OfflinePageDownloadBridge::ItemUpdated(const DownloadUIItem& item) {
183 JNIEnv* env = AttachCurrentThread(); 183 JNIEnv* env = AttachCurrentThread();
184 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); 184 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
185 if (obj.is_null()) 185 if (obj.is_null())
186 return; 186 return;
187 Java_OfflinePageDownloadBridge_downloadItemUpdated( 187 Java_OfflinePageDownloadBridge_downloadItemUpdated(
188 env, obj.obj(), ToJavaOfflinePageDownloadItem(env, item).obj()); 188 env, obj, ToJavaOfflinePageDownloadItem(env, item));
189 } 189 }
190 190
191 void OfflinePageDownloadBridge::SavePageCallback( 191 void OfflinePageDownloadBridge::SavePageCallback(
192 OfflinePageModel::SavePageResult result, int64_t offline_id) { 192 OfflinePageModel::SavePageResult result, int64_t offline_id) {
193 // TODO(dimich): Consider adding UMA here. 193 // TODO(dimich): Consider adding UMA here.
194 } 194 }
195 195
196 static jlong Init(JNIEnv* env, 196 static jlong Init(JNIEnv* env,
197 const JavaParamRef<jobject>& obj, 197 const JavaParamRef<jobject>& obj,
198 const JavaParamRef<jobject>& j_profile) { 198 const JavaParamRef<jobject>& j_profile) {
199 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); 199 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
200 OfflinePageModel* offline_page_model = 200 OfflinePageModel* offline_page_model =
201 OfflinePageModelFactory::GetForBrowserContext(profile); 201 OfflinePageModelFactory::GetForBrowserContext(profile);
202 202
203 DownloadUIAdapter* adapter = 203 DownloadUIAdapter* adapter =
204 DownloadUIAdapter::FromOfflinePageModel(offline_page_model); 204 DownloadUIAdapter::FromOfflinePageModel(offline_page_model);
205 205
206 return reinterpret_cast<jlong>( 206 return reinterpret_cast<jlong>(
207 new OfflinePageDownloadBridge(env, obj, adapter)); 207 new OfflinePageDownloadBridge(env, obj, adapter));
208 } 208 }
209 209
210 } // namespace android 210 } // namespace android
211 } // namespace offline_pages 211 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698