extensions: remove install/uninstall terminology

replace with add/remove

BUG=102610
TEST=manual (for those strings I actually know how to trigger)


Review URL: http://codereview.chromium.org/8835003

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

4 files changed, 19 insertions, 8 deletions

diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index 3010f02..4bdf618 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -15,7 +15,9 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 
 enum MenuEntries {
   NAME = 0,
@@ -63,7 +65,8 @@ void ExtensionContextMenuModel::InitCommonCommands() {
   AddSeparator();
   AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS);
   AddItemWithStringId(DISABLE, IDS_EXTENSIONS_DISABLE);
-  AddItemWithStringId(UNINSTALL, IDS_EXTENSIONS_UNINSTALL);
+  AddItem(UNINSTALL, l10n_util::GetStringFUTF16(IDS_EXTENSIONS_UNINSTALL,
+      l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
   if (extension->browser_action())
     AddItemWithStringId(HIDE, IDS_EXTENSIONS_HIDE_BUTTON);
   AddSeparator();
diff --git a/chrome/browser/extensions/extension_global_error.cc b/chrome/browser/extensions/extension_global_error.cc
index ca1cb58..26c5376 100644
--- a/chrome/browser/extensions/extension_global_error.cc
+++ b/chrome/browser/extensions/extension_global_error.cc
@@ -9,6 +9,7 @@
 #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"
 
@@ -97,8 +98,10 @@ string16 ExtensionGlobalError::GenerateMessageSection(
   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())));
+    message += l10n_util::GetStringFUTF16(
+        template_message_id,
+        string16(ASCIIToUTF16(e->name())),
+        l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   }
   return message;
 }
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 4c92688..c1fb827 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -42,7 +42,7 @@
 #include "ui/base/resource/resource_bundle.h"
 
 static const int kTitleIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
-  IDS_EXTENSION_INSTALL_PROMPT_TITLE,
+  0,
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
   IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE
@@ -55,7 +55,7 @@ static const int kHeadingIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
 };
 static const int kAcceptButtonIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
-  IDS_EXTENSION_PROMPT_INLINE_INSTALL_BUTTON,
+  IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
   IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON,
   IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON
 };
@@ -103,8 +103,13 @@ void ExtensionInstallUI::Prompt::SetInlineInstallWebstoreData(
   rating_count_ = rating_count;
 }
 
-string16 ExtensionInstallUI::Prompt::GetDialogTitle() const {
-  if (type_ == INLINE_INSTALL_PROMPT) {
+string16 ExtensionInstallUI::Prompt::GetDialogTitle(
+    const Extension* extension) const {
+  if (type_ == INSTALL_PROMPT) {
+    return l10n_util::GetStringUTF16(extension->is_app() ?
+        IDS_EXTENSION_INSTALL_APP_PROMPT_TITLE :
+        IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE);
+  } else if (type_ == INLINE_INSTALL_PROMPT) {
     return l10n_util::GetStringFUTF16(
       kTitleIds[type_], l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   } else {
diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h
index 93d4130..e434029 100644
--- a/chrome/browser/extensions/extension_install_ui.h
+++ b/chrome/browser/extensions/extension_install_ui.h
@@ -53,7 +53,7 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
     PromptType type() const { return type_; }
 
     // Getters for UI element labels.
-    string16 GetDialogTitle() const;
+    string16 GetDialogTitle(const Extension* extension) const;
     string16 GetHeading(std::string extension_name) const;
     string16 GetAcceptButtonLabel() const;
     bool HasAbortButtonLabel() const;