Return a speed of 0 if a download is paused from DownloadItem, instead of checking when rendering.

chrome/browser/download/download_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 547 matching lines @@
     if (base::i18n::AdjustStringForLocaleDirection(total_text,
                                                    &total_text_localized))
       total_text.assign(total_text_localized);
 
     amount = l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SIZE,
                                    received_size,
                                    total_text);
   } else {
     amount.assign(received_size);
   }
-  std::wstring speed_text;
-  if (download->is_paused()) {
-    // If the download is paused, set the rate to 0B/s.
-    amount_units = GetByteDisplayUnits(0);
-    speed_text = UTF16ToWideHack(FormatSpeed(0, amount_units, true));
-  } else {
-    amount_units = GetByteDisplayUnits(download->CurrentSpeed());
-    speed_text = UTF16ToWideHack(FormatSpeed(download->CurrentSpeed(),
-                                             amount_units, true));
-  }
+  amount_units = GetByteDisplayUnits(download->CurrentSpeed());

[Paweł Hajdan Jr., 2010/11/12 09:18:01]

nit: Can you store the value of CurrentSpeed on a local variable to avoid
calling it twice?

+  std::wstring speed_text =
+      UTF16ToWideHack(FormatSpeed(download->CurrentSpeed(), amount_units,
+                                  true));
   std::wstring speed_text_localized;
   if (base::i18n::AdjustStringForLocaleDirection(speed_text,
                                                  &speed_text_localized))
     speed_text.assign(speed_text_localized);
 
   base::TimeDelta remaining;
   string16 time_remaining;
   if (download->is_paused())
     time_remaining = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   else if (download->TimeRemaining(&remaining))
@@ skipping 159 matching lines @@
     ExtensionsService* service = profile->GetExtensionsService();
     if (!service ||
         !service->IsDownloadFromGallery(info->url, info->referrer_url)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace download_util
-