Improve the UI for disabling off-store extension install.

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/download/download_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #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"
 #include "content/public/browser/download_item.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/base/text/text_elider.h"
 
@@ skipping 55 matching lines @@
     case DownloadItem::IN_PROGRESS:
 #if defined(OS_CHROMEOS)
       if (is_gdata && size == 0) {
         // We haven't started the upload yet. The download needs to progress
         // further before we will see any upload progress. Show "Downloading..."
         // until we start uploading.
         status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_WAITING);
         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
         // being unpacked and validated.
         status_text = l10n_util::GetStringUTF16(
             IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING);
       } else if (download_->GetOpenWhenComplete()) {
         if (simple_time.empty()) {
           status_text =
               l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE);
@@ skipping 77 matching lines @@
 
 string16 DownloadItemModel::GetWarningText(const gfx::Font& font,
                                            int base_width) {
   // Should only be called if IsDangerous().
   DCHECK(IsDangerous());
   switch (download_->GetDangerType()) {
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
       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 {
         return l10n_util::GetStringFUTF16(
             IDS_PROMPT_DANGEROUS_DOWNLOAD,
             ui::ElideFilename(download_->GetFileNameToReportUser(),
                               font, base_width));
       }
 
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
@@ skipping 14 matching lines @@
       NOTREACHED();
   }
   return string16();
 }
 
 string16 DownloadItemModel::GetWarningConfirmButtonText() {
   // Should only be called if IsDangerous()
   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);
   }
 }
 
 bool DownloadItemModel::IsMalicious() {
   if (!IsDangerous())
     return false;
   switch (download_->GetDangerType()) {
@@ skipping 128 matching lines @@
       break;
     default:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
       break;
   }
 
   status_text = l10n_util::GetStringUTF16(string_id);
 
   return status_text;
 }