Offer user to send feedback from profile error dialog

chrome/browser/ui/views/simple_message_box_views.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/simple_message_box.h"
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 19 matching lines @@
 
 namespace {
 
 class SimpleMessageBoxViews : public views::DialogDelegate {
  public:
   SimpleMessageBoxViews(const base::string16& title,
                         const base::string16& message,
                         MessageBoxType type,
                         const base::string16& yes_text,
                         const base::string16& no_text,
+                        const base::string16& checkbox_text,
                         bool is_system_modal);
   ~SimpleMessageBoxViews() override;
 
   MessageBoxResult RunDialogAndGetResult();
 
   // Overridden from views::DialogDelegate:
   int GetDialogButtons() const override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool Cancel() override;
   bool Accept() override;
 
   // Overridden from views::WidgetDelegate:
   base::string16 GetWindowTitle() const override;
   void DeleteDelegate() override;
   ui::ModalType GetModalType() const override;
   views::View* GetContentsView() override;
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
 
  private:
   // This terminates the nested message-loop.
   void Done();
 
   const base::string16 window_title_;
   const MessageBoxType type_;
   base::string16 yes_text_;
   base::string16 no_text_;
   MessageBoxResult* result_;
-  bool is_system_modal_;
   views::MessageBoxView* message_box_view_;
   base::Closure quit_runloop_;
+  bool is_system_modal_;
+  bool has_checkbox_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMessageBoxViews);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, public:
 
-SimpleMessageBoxViews::SimpleMessageBoxViews(const base::string16& title,
-                                             const base::string16& message,
-                                             MessageBoxType type,
-                                             const base::string16& yes_text,
-                                             const base::string16& no_text,
-                                             bool is_system_modal)
+SimpleMessageBoxViews::SimpleMessageBoxViews(
+    const base::string16& title,
+    const base::string16& message,
+    MessageBoxType type,
+    const base::string16& yes_text,
+    const base::string16& no_text,
+    const base::string16& checkbox_text,
+    bool is_system_modal)
     : window_title_(title),
       type_(type),
       yes_text_(yes_text),
       no_text_(no_text),
       result_(NULL),
+      message_box_view_(new views::MessageBoxView(
+          views::MessageBoxView::InitParams(message))),
       is_system_modal_(is_system_modal),
-      message_box_view_(new views::MessageBoxView(
-          views::MessageBoxView::InitParams(message))) {
+      has_checkbox_(!checkbox_text.empty()) {
   if (yes_text_.empty()) {
     yes_text_ =
         type_ == MESSAGE_BOX_TYPE_QUESTION
             ? l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL)
             : l10n_util::GetStringUTF16(IDS_OK);
   }
 
   if (no_text_.empty() && type_ == MESSAGE_BOX_TYPE_QUESTION)
     no_text_ = l10n_util::GetStringUTF16(IDS_CANCEL);
+
+  if (has_checkbox_) {
+    message_box_view_->SetCheckBoxLabel(checkbox_text);
+    message_box_view_->SetCheckBoxSelected(true);
+  }
 }
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
 MessageBoxResult SimpleMessageBoxViews::RunDialogAndGetResult() {
   MessageBoxResult result = MESSAGE_BOX_RESULT_NO;
   result_ = &result;
   // TODO(pkotwicz): Exit message loop when the dialog is closed by some other
   // means than |Cancel| or |Accept|. crbug.com/404385
@@ skipping 19 matching lines @@
   return yes_text_;
 }
 
 bool SimpleMessageBoxViews::Cancel() {
   *result_ = MESSAGE_BOX_RESULT_NO;
   Done();
   return true;
 }
 
 bool SimpleMessageBoxViews::Accept() {
-  *result_ = MESSAGE_BOX_RESULT_YES;
+  if (!has_checkbox_ || message_box_view_->IsCheckBoxSelected())
+    *result_ = MESSAGE_BOX_RESULT_YES;
+  else
+    *result_ = MESSAGE_BOX_RESULT_NO;
+
   Done();
   return true;
 }
 
 base::string16 SimpleMessageBoxViews::GetWindowTitle() const {
   return window_title_;
 }
 
 void SimpleMessageBoxViews::DeleteDelegate() {
   delete this;
@@ skipping 35 matching lines @@
   NOTREACHED();
   return flags | MB_OK | MB_ICONWARNING;
 }
 #endif
 
 MessageBoxResult ShowMessageBoxImpl(gfx::NativeWindow parent,
                                     const base::string16& title,
                                     const base::string16& message,
                                     MessageBoxType type,
                                     const base::string16& yes_text,
-                                    const base::string16& no_text) {
+                                    const base::string16& no_text,
+                                    const base::string16& checkbox_text) {
   startup_metric_utils::SetNonBrowserUIDisplayed();
   if (internal::g_should_skip_message_box_for_test)
     return MESSAGE_BOX_RESULT_YES;
 
   // Views dialogs cannot be shown outside the UI thread message loop or if the
   // ResourceBundle is not initialized yet.
   // Fallback to logging with a default response or a Windows MessageBox.
 #if defined(OS_WIN)
   if (!base::MessageLoopForUI::IsCurrent() ||
       !base::MessageLoopForUI::current()->is_running() ||
       !ResourceBundle::HasSharedInstance()) {
+    LOG_IF(ERROR, !checkbox_text.empty()) << "Dialog checkbox won't be shown";
     int result = ui::MessageBox(views::HWNDForNativeWindow(parent), message,
                                 title, GetMessageBoxFlagsFromType(type));
     return (result == IDYES || result == IDOK) ?
         MESSAGE_BOX_RESULT_YES : MESSAGE_BOX_RESULT_NO;
   }
 #else
   if (!base::MessageLoopForUI::IsCurrent() ||
       !ResourceBundle::HasSharedInstance()) {
     LOG(ERROR) << "Unable to show a dialog outside the UI thread message loop: "
                << title << " - " << message;
     return MESSAGE_BOX_RESULT_NO;
   }
 #endif
 
-  SimpleMessageBoxViews* dialog =
-      new SimpleMessageBoxViews(title,
-                                message,
-                                type,
-                                yes_text,
-                                no_text,
-                                parent == NULL  // is_system_modal
-                                );
+  SimpleMessageBoxViews* dialog = new SimpleMessageBoxViews(
+      title, message, type, yes_text, no_text, checkbox_text,
+      parent == NULL  // is_system_modal

[Lei Zhang, 2016/07/16 00:35:21]

nit: foo == NULL -> !foo ?

[afakhry, 2016/07/18 17:43:51]

Done.

+      );
   constrained_window::CreateBrowserModalDialogViews(dialog, parent)->Show();
 
   // NOTE: |dialog| may have been deleted by the time |RunDialogAndGetResult()|
   // returns.
   return dialog->RunDialogAndGetResult();
 }
 
 }  // namespace
 
 void ShowWarningMessageBox(gfx::NativeWindow parent,
                            const base::string16& title,
                            const base::string16& message) {
   ShowMessageBoxImpl(parent, title, message, MESSAGE_BOX_TYPE_WARNING,
-                     base::string16(), base::string16());
+                     base::string16(), base::string16(), base::string16());
+}
+
+bool ShowWarningMessageBoxWithCheckbox(gfx::NativeWindow parent,
+                                       const base::string16& title,
+                                       const base::string16& message,
+                                       const base::string16& checkbox_text) {
+  return ShowMessageBoxImpl(parent, title, message, MESSAGE_BOX_TYPE_WARNING,
+                            base::string16(), base::string16(),
+                            checkbox_text) == MESSAGE_BOX_RESULT_YES;
 }
 
 MessageBoxResult ShowQuestionMessageBox(gfx::NativeWindow parent,
                                         const base::string16& title,
                                         const base::string16& message) {
   return ShowMessageBoxImpl(parent, title, message, MESSAGE_BOX_TYPE_QUESTION,
-                            base::string16(), base::string16());
+                            base::string16(), base::string16(),
+                            base::string16());
 }
 
 MessageBoxResult ShowMessageBoxWithButtonText(gfx::NativeWindow parent,
                                               const base::string16& title,
                                               const base::string16& message,
                                               const base::string16& yes_text,
                                               const base::string16& no_text) {
-  return ShowMessageBoxImpl(
-      parent, title, message, MESSAGE_BOX_TYPE_QUESTION, yes_text, no_text);
+  return ShowMessageBoxImpl(parent, title, message, MESSAGE_BOX_TYPE_QUESTION,
+                            yes_text, no_text, base::string16());
 }
 
 }  // namespace chrome