Settings reset prompt: add more UI metrics.

chrome/browser/ui/views/settings_reset_prompt_dialog.cc

 // Copyright 2017 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/settings_reset_prompt_dialog.h"
 
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "components/constrained_window/constrained_window_views.h"
@@ skipping 18 matching lines @@
 }
 
 }  // namespace safe_browsing
 
 namespace {
 constexpr int kDialogWidth = 448;
 }  // namespace
 
 SettingsResetPromptDialog::SettingsResetPromptDialog(
     safe_browsing::SettingsResetPromptController* controller)
-    : browser_(nullptr), controller_(controller), interaction_done_(false) {
+    : browser_(nullptr), controller_(controller) {
   DCHECK(controller_);
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
                                         views::kButtonHEdgeMarginNew,
                                         views::kPanelVertMargin, 0));
 
   views::StyledLabel* dialog_label =
       new views::StyledLabel(controller_->GetMainText(), /*listener=*/nullptr);
   views::StyledLabel::RangeStyleInfo url_style;
   url_style.weight = gfx::Font::Weight::BOLD;
   dialog_label->AddStyleRange(controller_->GetMainTextUrlRange(), url_style);
   AddChildView(dialog_label);
 }
 
 SettingsResetPromptDialog::~SettingsResetPromptDialog() {
   // Make sure the controller is correctly notified in case the dialog widget is
   // closed by some other means than the dialog buttons.
-  Close();
+  if (controller_)
+    controller_->Close();
 }
 
 void SettingsResetPromptDialog::Show(Browser* browser) {
   DCHECK(browser);
+  DCHECK(controller_);
+
   browser_ = browser;
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   constrained_window::CreateBrowserModalDialogViews(
       this, browser_view->GetNativeWindow())
       ->Show();
   controller_->DialogShown();
 }
 
 // WidgetDelegate overrides.
 
 ui::ModalType SettingsResetPromptDialog::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 bool SettingsResetPromptDialog::ShouldShowWindowIcon() const {
   return false;
 }
 
 base::string16 SettingsResetPromptDialog::GetWindowTitle() const {
+  DCHECK(controller_);
   return controller_->GetWindowTitle();
 }
 
 // DialogModel overrides.
 
 bool SettingsResetPromptDialog::ShouldDefaultButtonBeBlue() const {
   return true;
 }
 
 // DialogDelegate overrides.
 
 base::string16 SettingsResetPromptDialog::GetDialogButtonLabel(
     ui::DialogButton button) const {
   DCHECK(button == ui::DIALOG_BUTTON_OK || button == ui::DIALOG_BUTTON_CANCEL);
+  DCHECK(controller_);
 
   if (button == ui::DIALOG_BUTTON_OK)
     return controller_->GetButtonLabel();
   return DialogDelegate::GetDialogButtonLabel(button);
 }
 
 bool SettingsResetPromptDialog::Accept() {
-  if (!interaction_done_) {
-    interaction_done_ = true;
+  if (controller_) {
     controller_->Accept();
+    controller_ = nullptr;
   }
   return true;
 }
 
 bool SettingsResetPromptDialog::Cancel() {
-  if (!interaction_done_) {
-    interaction_done_ = true;
+  if (controller_) {
     controller_->Cancel();
+    controller_ = nullptr;
   }
   return true;
 }
+
+bool SettingsResetPromptDialog::Close() {
+  if (controller_) {
+    controller_->Close();
+    controller_ = nullptr;
+  }
+  return true;
+}
 
 // View overrides.
 
 gfx::Size SettingsResetPromptDialog::GetPreferredSize() const {
   return gfx::Size(kDialogWidth, GetHeightForWidth(kDialogWidth));
 }