Simplify the text in the external protocol confirmation dialog.

chrome/browser/ui/external_protocol_dialog_delegate.cc

Index: chrome/browser/ui/external_protocol_dialog_delegate.cc
diff --git a/chrome/browser/ui/external_protocol_dialog_delegate.cc b/chrome/browser/ui/external_protocol_dialog_delegate.cc
index 104e164846b5b4c1aab07068313f212cf21bef55..16a400781f9a7c0df01e57226d7f8724d5c6fb6a 100644
--- a/chrome/browser/ui/external_protocol_dialog_delegate.cc
+++ b/chrome/browser/ui/external_protocol_dialog_delegate.cc
@@ -15,6 +15,17 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 
+namespace {
+
+const size_t kMaxCommandSize = 256;
+
+base::string16 ElideCommandName(const base::string16& command_name) {
+  base::string16 elided_command;
+  gfx::ElideString(command_name, kMaxCommandSize, &elided_command);
+  return elided_command;
+}
+}  // namespace
+
 ExternalProtocolDialogDelegate::ExternalProtocolDialogDelegate(
     const GURL& url,
     int render_process_host_id,
@@ -27,34 +38,27 @@ ExternalProtocolDialogDelegate::ExternalProtocolDialogDelegate(
 ExternalProtocolDialogDelegate::~ExternalProtocolDialogDelegate() {
 }
 
-base::string16 ExternalProtocolDialogDelegate::GetMessageText() const {
-  const size_t kMaxUrlWithoutSchemeSize = 256;
-  const size_t kMaxCommandSize = 256;
-  base::string16 elided_url_without_scheme;
-  base::string16 elided_command;
-  gfx::ElideString(base::ASCIIToUTF16(url().possibly_invalid_spec()),
-                  kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
-  gfx::ElideString(program_name_, kMaxCommandSize, &elided_command);
-
-  base::string16 message_text = l10n_util::GetStringFUTF16(
-      IDS_EXTERNAL_PROTOCOL_INFORMATION,
-      base::ASCIIToUTF16(url().scheme() + ":"),
-      elided_url_without_scheme) + base::ASCIIToUTF16("\n\n");
-
-  message_text += l10n_util::GetStringFUTF16(
-      IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH,
-      elided_command) + base::ASCIIToUTF16("\n\n");
+base::string16 ExternalProtocolDialogDelegate::GetDialogButtonLabel(
+    ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK)
+    return l10n_util::GetStringFUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT,
+                                      ElideCommandName(program_name_));
+  else
+    return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT);
+}
 
-  message_text += l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING);
-  return message_text;
+base::string16 ExternalProtocolDialogDelegate::GetMessageText() const {
+  return base::ASCIIToUTF16("");
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetCheckboxText() const {
-  return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT);
+  return l10n_util::GetStringFUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT,
+                                    ElideCommandName(program_name_));
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetTitleText() const {
-  return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_TITLE);
+  return l10n_util::GetStringFUTF16(IDS_EXTERNAL_PROTOCOL_TITLE,
+                                    ElideCommandName(program_name_));
 }
 
 void ExternalProtocolDialogDelegate::DoAccept(