Chromium Code Reviews| Index: chrome/browser/android/download/download_manager_service.cc |
| diff --git a/chrome/browser/android/download/download_manager_service.cc b/chrome/browser/android/download/download_manager_service.cc |
| index dac7b572bab372c8e53d1fd76aa808b922840857..f6227d22e58403c527eafc61e729de9b2345d3fc 100644 |
| --- a/chrome/browser/android/download/download_manager_service.cc |
| +++ b/chrome/browser/android/download/download_manager_service.cc |
| @@ -95,27 +95,21 @@ ScopedJavaLocalRef<jobject> DownloadManagerService::CreateJavaDownloadInfo( |
| bool has_user_gesture = item->HasUserGesture() || user_initiated; |
| base::TimeDelta time_delta; |
| - item->TimeRemaining(&time_delta); |
| + bool time_remaining_known = item->TimeRemaining(&time_delta); |
| std::string original_url = item->GetOriginalUrl().SchemeIs(url::kDataScheme) |
| ? std::string() : item->GetOriginalUrl().spec(); |
| return Java_DownloadInfo_createDownloadInfo( |
| - env, |
| - ConvertUTF8ToJavaString(env, item->GetGuid()), |
| - ConvertUTF8ToJavaString(env, |
| - item->GetFileNameToReportUser().value()), |
| + env, ConvertUTF8ToJavaString(env, item->GetGuid()), |
| + ConvertUTF8ToJavaString(env, item->GetFileNameToReportUser().value()), |
| ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value()), |
| ConvertUTF8ToJavaString(env, item->GetTabUrl().spec()), |
| ConvertUTF8ToJavaString(env, item->GetMimeType()), |
| - item->GetReceivedBytes(), |
| - item->GetBrowserContext()->IsOffTheRecord(), |
| - item->GetState(), |
| - item->PercentComplete(), |
| - item->IsPaused(), |
| - has_user_gesture, |
| - item->CanResume(), |
| + item->GetReceivedBytes(), item->GetBrowserContext()->IsOffTheRecord(), |
| + item->GetState(), item->PercentComplete(), item->IsPaused(), |
| + has_user_gesture, item->CanResume(), |
| ConvertUTF8ToJavaString(env, original_url), |
| ConvertUTF8ToJavaString(env, item->GetReferrerUrl().spec()), |
| - time_delta.InMilliseconds()); |
| + time_remaining_known ? time_delta.InMilliseconds() : -1); |
|
qinmin
2017/01/25 18:21:51
define a constant here: kUnknownRemainingTime, e.g
shaktisahu
2017/01/25 19:24:56
Done.
|
| } |
| static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |