Index: chrome/browser/download/download_item_model.cc |
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc |
index 2dc23262222f6c3c5004a69b9a112b892d3b2509..775fa0513febb6069185c5af50ad7e624d3dde24 100644 |
--- a/chrome/browser/download/download_item_model.cc |
+++ b/chrome/browser/download/download_item_model.cc |
@@ -9,7 +9,8 @@ |
#include "base/string16.h" |
#include "base/sys_string_conversions.h" |
#include "base/utf_string_conversions.h" |
-#include "chrome/browser/download/chrome_download_manager_delegate.h" |
+#include "base/time.h" |
+#include "chrome/browser/download/download_crx_util.h" |
#include "chrome/common/time_format.h" |
#include "content/public/browser/download_danger_type.h" |
#include "content/public/browser/download_interrupt_reasons.h" |
@@ -85,7 +86,7 @@ string16 DownloadItemModel::GetStatusText() { |
break; |
} |
#endif |
- if (ChromeDownloadManagerDelegate::IsExtensionDownload(download_) && |
+ if (download_crx_util::IsExtensionDownload(*download_) && |
download_->AllDataSaved() && |
download_->GetState() == DownloadItem::IN_PROGRESS) { |
// The download is a CRX (app, extension, theme, ...) and it is |
@@ -183,7 +184,7 @@ string16 DownloadItemModel::GetWarningText(const gfx::Font& font, |
return l10n_util::GetStringUTF16(IDS_PROMPT_MALICIOUS_DOWNLOAD_URL); |
case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE: |
- if (ChromeDownloadManagerDelegate::IsExtensionDownload(download_)) { |
+ if (download_crx_util::IsExtensionDownload(*download_)) { |
return l10n_util::GetStringUTF16( |
IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION); |
} else { |
@@ -218,7 +219,7 @@ string16 DownloadItemModel::GetWarningConfirmButtonText() { |
DCHECK(IsDangerous()); |
if (download_->GetDangerType() == |
content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE && |
- ChromeDownloadManagerDelegate::IsExtensionDownload(download_)) { |
+ download_crx_util::IsExtensionDownload(*download_)) { |
return l10n_util::GetStringUTF16(IDS_CONTINUE_EXTENSION_DOWNLOAD); |
} else { |
return l10n_util::GetStringUTF16(IDS_CONFIRM_DOWNLOAD); |