Tweak install and dangerous download dialogs for apps.

BUG=45155
TEST=Run chrome with the --enable-apps flag.Install an app - the confirmation
dialog should say "..this App..." instead of "...this Extension...". Install an
extension - it should stil say "Extension".


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

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

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index dbe6898..b34c82d 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -25,10 +25,6 @@
 
 namespace {
 
-bool TreatAsApp(const Extension* extension) {
-  return !extension->GetFullLaunchURL().is_empty();
-}
-
 // This extracts an int from a ListValue at the given |index|.
 bool ExtractInt(const ListValue* list, size_t index, int* out_int) {
   std::string string_value;
@@ -119,7 +115,7 @@ void AppLauncherHandler::HandleGetApps(const Value* value) {
   const ExtensionList* extensions = extensions_service_->extensions();
   for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
-     if (TreatAsApp(*it)) {
+     if ((*it)->IsApp()) {
        DictionaryValue* app_info = new DictionaryValue();
        CreateAppInfo(*it, app_info);
        list->Append(app_info);
diff --git a/chrome/browser/gtk/extension_install_prompt2_gtk.cc b/chrome/browser/gtk/extension_install_prompt2_gtk.cc
index b49dcbb..6a442f2 100644
--- a/chrome/browser/gtk/extension_install_prompt2_gtk.cc
+++ b/chrome/browser/gtk/extension_install_prompt2_gtk.cc
@@ -107,8 +107,11 @@ void ShowInstallPromptDialog2(GtkWindow* parent, SkBitmap* skia_icon,
                      !show_permissions, !show_permissions, 0);
 
   if (show_permissions) {
+    int label = extension->IsApp() ?
+                IDS_EXTENSION_PROMPT2_APP_WILL_HAVE_ACCESS_TO :
+                IDS_EXTENSION_PROMPT2_WILL_HAVE_ACCESS_TO;
     GtkWidget* warning_label = gtk_label_new(l10n_util::GetStringUTF8(
-        IDS_EXTENSION_PROMPT2_WILL_HAVE_ACCESS_TO).c_str());
+        label).c_str());
     gtk_label_set_line_wrap(GTK_LABEL(warning_label), TRUE);
     gtk_widget_set_size_request(warning_label, kRightColumnWidth, -1);
     gtk_misc_set_alignment(GTK_MISC(warning_label), 0.0, 0.5);
diff --git a/chrome/browser/views/extensions/extension_install_prompt2.cc b/chrome/browser/views/extensions/extension_install_prompt2.cc
index 1b8387c..cb6dab9 100644
--- a/chrome/browser/views/extensions/extension_install_prompt2.cc
+++ b/chrome/browser/views/extensions/extension_install_prompt2.cc
@@ -139,9 +139,10 @@ InstallDialogContent2::InstallDialogContent2(
     right_column_width_ = kNoPermissionsRightColumnWidth;
   } else {
     right_column_width_ = kPermissionBoxWidth;
-
-    will_have_access_to_ = new views::Label(
-        l10n_util::GetString(IDS_EXTENSION_PROMPT2_WILL_HAVE_ACCESS_TO));
+    int label = extension->IsApp() ?
+                IDS_EXTENSION_PROMPT2_APP_WILL_HAVE_ACCESS_TO :
+                IDS_EXTENSION_PROMPT2_WILL_HAVE_ACCESS_TO;
+    will_have_access_to_ = new views::Label(l10n_util::GetString(label));
     will_have_access_to_->SetMultiLine(true);
     will_have_access_to_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(will_have_access_to_);