Have different text for apps and regular extensions in some more places.

chrome/browser/extensions/extension_error_ui.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/extensions/extension_error_ui.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 22 matching lines @@
 void ExtensionErrorUI::AddBlacklistedExtension(const std::string& id) {
   blacklisted_extension_ids_->insert(id);
 }
 
 void ExtensionErrorUI::AddOrphanedExtension(const std::string& id) {
   orphaned_extension_ids_->insert(id);
 }
 
 string16 ExtensionErrorUI::GenerateMessageSection(
     const ExtensionIdSet* extensions,
-    int template_message_id) {
+    int extension_template_message_id,
+    int app_template_message_id) {
   CHECK(extensions);
-  CHECK(template_message_id);
+  CHECK(extension_template_message_id);
+  CHECK(app_template_message_id);
   string16 message;
 
   for (ExtensionIdSet::const_iterator iter = extensions->begin();
        iter != extensions->end(); ++iter) {
     const extensions::Extension* e = extension_service_->GetExtensionById(*iter,
         true);
-    message += l10n_util::GetStringFUTF16(template_message_id,
-                                          UTF8ToUTF16(e->name()));
+    message += l10n_util::GetStringFUTF16(
+        e->is_app() ? app_template_message_id : extension_template_message_id,
+        UTF8ToUTF16(e->name())) + char16('\n');
   }
   return message;
 }
 
 string16 ExtensionErrorUI::GenerateMessage() {
   return GenerateMessageSection(external_extension_ids_.get(),
-                                IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
+                                IDS_EXTENSION_ALERT_ITEM_EXTERNAL,
+                                IDS_APP_ALERT_ITEM_EXTERNAL) +
          GenerateMessageSection(blacklisted_extension_ids_.get(),
-                                IDS_EXTENSION_ALERT_ITEM_BLACKLISTED) +
+                                IDS_EXTENSION_ALERT_ITEM_BLACKLISTED,
+                                IDS_APP_ALERT_ITEM_BLACKLISTED) +
          GenerateMessageSection(orphaned_extension_ids_.get(),
-                                IDS_EXTENSION_ALERT_ITEM_ORPHANED);
+                                IDS_EXTENSION_ALERT_ITEM_ORPHANED,
+                                IDS_APP_ALERT_ITEM_ORPHANED);
 }
 
 string16 ExtensionErrorUI::GetBubbleViewMessage() {
   if (message_.empty()) {
     message_ = GenerateMessage();
     if (message_[message_.size()-1] == '\n')
       message_.resize(message_.size()-1);
   }
   return message_;
 }
@@ skipping 15 matching lines @@
   extension_service_->HandleExtensionAlertClosed();
 }
 
 void ExtensionErrorUI::BubbleViewAcceptButtonPressed() {
   extension_service_->HandleExtensionAlertAccept();
 }
 
 void ExtensionErrorUI::BubbleViewCancelButtonPressed() {
   extension_service_->HandleExtensionAlertDetails();
 }