Revert 113568 - extensions: remove install/uninstall terminology

chrome/browser/extensions/extension_global_error.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/extensions/extension_global_error.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/global_error.h"
-#include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionGlobalError::ExtensionGlobalError(
       base::WeakPtr<ExtensionService> extension_service)
     : current_browser_(NULL),
       should_delete_self_on_close_(true),
       extension_service_(extension_service),
       external_extension_ids_(new ExtensionIdSet),
       blacklisted_extension_ids_(new ExtensionIdSet),
@@ skipping 68 matching lines @@
 string16 ExtensionGlobalError::GenerateMessageSection(
     const ExtensionIdSet* extensions,
     int template_message_id) {
   CHECK(extensions);
   CHECK(template_message_id);
   string16 message;
 
   for (ExtensionIdSet::const_iterator iter = extensions->begin();
        iter != extensions->end(); ++iter) {
     const Extension* e = extension_service_->GetExtensionById(*iter, true);
-    message += l10n_util::GetStringFUTF16(
-        template_message_id,
-        string16(ASCIIToUTF16(e->name())),
-        l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
+    message += l10n_util::GetStringFUTF16(template_message_id,
+                                          string16(ASCIIToUTF16(e->name())));
   }
   return message;
 }
 
 string16 ExtensionGlobalError::GenerateMessage() {
   if (extension_service_.get()) {
     return
         GenerateMessageSection(external_extension_ids_.get(),
                                IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
         GenerateMessageSection(blacklisted_extension_ids_.get(),
@@ skipping 33 matching lines @@
   if (!accept_callback_.is_null()) {
     accept_callback_.Run(*this, current_browser_);
   }
 }
 
 void ExtensionGlobalError::BubbleViewCancelButtonPressed() {
   if (!cancel_callback_.is_null()) {
     cancel_callback_.Run(*this, current_browser_);
   }
 }