Change text for extension download UI.

BUG=23105
TEST=none
Review URL: http://codereview.chromium.org/261026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28621 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 25 insertions, 12 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e140ce2..0ec8bbe 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1992,6 +1992,10 @@ each locale. -->
                desc="Message shown to the user to validate the download of a dangerous file.">
         This type of file can harm your computer. Are you sure you want to download <ph name="FILE_NAME">$1<ex>malware.exe</ex></ph>?
       </message>
+      <message name="IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION"
+         desc="Message shown to the user to validate the download of an extension file.">
+        Extensions can harm your computer. Are you sure you want to continue?
+      </message>
       <message name="IDS_SAVE_DOWNLOAD"
                desc="Text for the button used to validate the downloading of a dangerous download.">
         Save
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index b9925e7..f0cdb97 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -54,16 +54,6 @@
 #include <gtk/gtk.h>
 #endif
 
-namespace {
-static bool IsExtensionInstall(const DownloadItem* item) {
-  return item->mime_type() == Extension::kMimeType && !item->save_as();
-}
-
-static bool IsExtensionInstall(const DownloadCreateInfo* info) {
-  return info->mime_type == Extension::kMimeType && !info->save_as;
-}
-}
-
 // Periodically update our observers.
 class DownloadItemUpdateTask : public Task {
  public:
@@ -1464,6 +1454,14 @@ void DownloadManager::GenerateSafeFilename(const std::string& mime_type,
 #endif
 }
 
+bool DownloadManager::IsExtensionInstall(const DownloadItem* item) {
+  return item->mime_type() == Extension::kMimeType && !item->save_as();
+}
+
+bool DownloadManager::IsExtensionInstall(const DownloadCreateInfo* info) {
+  return info->mime_type == Extension::kMimeType && !info->save_as;
+}
+
 // Operations posted to us from the history service ----------------------------
 
 // The history service has retrieved all download entries. 'entries' contains
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index f4f2c4b..f2fea6e 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -457,6 +457,10 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
   void GenerateSafeFilename(const std::string& mime_type,
                             FilePath* file_name);
 
+  // Used to determine whether the download item is an extension file or not.
+  static bool IsExtensionInstall(const DownloadItem* item);
+  static bool IsExtensionInstall(const DownloadCreateInfo* info);
+
  private:
   // Opens a download via the Windows shell.
   void OpenDownloadInShell(const DownloadItem* download,
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 3bdfaca..5869b15 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -324,8 +324,15 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
     std::wstring filename = rootname + L"." + extension;
     if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
       l10n_util::WrapStringWithLTRFormatting(&filename);
-    dangerous_download_label_ = new views::Label(
-        l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, filename));
+
+    // The dangerous download label text is different for an extension file.
+    if (DownloadManager::IsExtensionInstall(download)) {
+      dangerous_download_label_ = new views::Label(
+          l10n_util::GetString(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION));
+    } else {
+      dangerous_download_label_ = new views::Label(
+          l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, filename));
+    }
     dangerous_download_label_->SetMultiLine(true);
     dangerous_download_label_->SetHorizontalAlignment(
         views::Label::ALIGN_LEFT);