retry 113568 - extensions: remove install/uninstall terminology

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2011 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/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/save_package.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"
 
 using base::TimeDelta;
 
 // -----------------------------------------------------------------------------
 // DownloadItemModel
 
 DownloadItemModel::DownloadItemModel(DownloadItem* download)
@@ skipping 30 matching lines @@
   }
 
   string16 status_text;
   switch (download_->GetState()) {
     case DownloadItem::IN_PROGRESS:
       if (ChromeDownloadManagerDelegate::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);
+        status_text = l10n_util::GetStringFUTF16(
+            IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING,
+            l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
       } else if (download_->GetOpenWhenComplete()) {
         if (simple_time.empty()) {
           status_text =
               l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE);
         } else {
           status_text = l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPEN_IN,
                                                    simple_time);
         }
       } else {
         if (simple_time.empty()) {
@@ skipping 69 matching lines @@
           IDS_SAVE_PAGE_STATUS_INTERRUPTED,
           base::FormatNumber(size),
           base::FormatNumber(total_size));
       break;
     default:
       NOTREACHED();
   }
 
   return status_text;
 }