Simplify the text in the external protocol confirmation dialog.

chrome/browser/ui/views/external_protocol_dialog.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/ui/views/external_protocol_dialog.h"
 
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/external_protocol_dialog_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 34 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 // ExternalProtocolDialog, views::DialogDelegate implementation:
 
 int ExternalProtocolDialog::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 base::string16 ExternalProtocolDialog::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  if (button == ui::DIALOG_BUTTON_OK)
-    return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT);
-  else
-    return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT);
+  return delegate_->GetDialogButtonLabel(button);
 }
 
 base::string16 ExternalProtocolDialog::GetWindowTitle() const {
   return delegate_->GetTitleText();
 }
 
 void ExternalProtocolDialog::DeleteDelegate() {
   delete this;
 }
 
 bool ExternalProtocolDialog::Cancel() {
   // We also get called back here if the user closes the dialog or presses
   // escape. In these cases it would be preferable to ignore the state of the
   // check box but MessageBox doesn't distinguish this from pressing the cancel
   // button.
   delegate_->DoCancel(delegate_->url(),
                       message_box_view_->IsCheckBoxSelected());
 
+  ExternalProtocolHandler::RecordMetrics(
+      message_box_view_->IsCheckBoxSelected());
+
   // Returning true closes the dialog.
   return true;
 }
 
 bool ExternalProtocolDialog::Accept() {
   // We record how long it takes the user to accept an external protocol.  If
   // users start accepting these dialogs too quickly, we should worry about
   // clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.launch_url",
                            base::TimeTicks::Now() - creation_time_);
 
+  ExternalProtocolHandler::RecordMetrics(
+      message_box_view_->IsCheckBoxSelected());
+
   delegate_->DoAccept(delegate_->url(),
                       message_box_view_->IsCheckBoxSelected());
 
   // Returning true closes the dialog.
   return true;
 }
 
 views::View* ExternalProtocolDialog::GetContentsView() {
   return message_box_view_;
 }
@@ skipping 26 matching lines @@
   message_box_view_ = new views::MessageBoxView(params);
   message_box_view_->SetCheckBoxLabel(delegate_->GetCheckboxText());
 
   WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_host_id_, routing_id_);
   // Only launch the dialog if there is a web contents associated with the
   // request.
   if (web_contents)
     constrained_window::ShowWebModalDialogViews(this, web_contents);
 }