Remove DialogDelegate::Accept() variant

chrome/browser/ui/views/hung_renderer_view.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/hung_renderer_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 205 matching lines @@
     HungRendererDialogView::GetInstance()->EndForWebContents(contents);
 }
 
 // static
 bool HungRendererDialogView::IsFrameActive(WebContents* contents) {
   gfx::NativeWindow window =
       platform_util::GetTopLevel(contents->GetNativeView());
   return platform_util::IsWindowActive(window);
 }
 
-// static
-void HungRendererDialogView::KillRendererProcess(
-    content::RenderProcessHost* rph) {
-#if defined(OS_WIN)
-  // Try to generate a crash report for the hung process.
-  CrashDumpAndTerminateHungChildProcess(rph->GetHandle());
-#else
-  rph->Shutdown(content::RESULT_CODE_HUNG, false);
-#endif
-}
-
-
 HungRendererDialogView::HungRendererDialogView()
     : info_label_(nullptr),
       hung_pages_table_(nullptr),
       kill_button_(nullptr),
-      initialized_(false) {
+      initialized_(false),
+      kill_button_clicked_(false) {
   InitClass();
 }
 
 HungRendererDialogView::~HungRendererDialogView() {
   hung_pages_table_->SetModel(NULL);
 }
 
 void HungRendererDialogView::ShowForWebContents(WebContents* contents) {
   DCHECK(contents && GetWidget());
 
@@ skipping 72 matching lines @@
       IDS_BROWSER_HANGMONITOR_RENDERER_TITLE,
       hung_pages_table_model_->RowCount());
 }
 
 void HungRendererDialogView::WindowClosing() {
   // We are going to be deleted soon, so make sure our instance is destroyed.
   g_instance_ = NULL;
 }
 
 int HungRendererDialogView::GetDialogButtons() const {
-  // We specifically don't want a CANCEL button here because that code path is
-  // also called when the window is closed by the user clicking the X button in
-  // the window's titlebar, and also if we call Window::Close. Rather, we want
-  // the OK button to wait for responsiveness (and close the dialog) and our
-  // additional button (which we create) to kill the process (which will result
-  // in the dialog being destroyed).
-  return ui::DIALOG_BUTTON_OK;
+  return ui::DIALOG_BUTTON_CANCEL;
 }
 
 base::string16 HungRendererDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  if (button == ui::DIALOG_BUTTON_OK)
-    return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT);
-  return views::DialogDelegateView::GetDialogButtonLabel(button);
+  DCHECK_EQ(ui::DIALOG_BUTTON_CANCEL, button);
+  return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT);
 }
 
 views::View* HungRendererDialogView::CreateExtraView() {
   DCHECK(!kill_button_);
   kill_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_END));
   kill_button_->SetStyle(views::Button::STYLE_BUTTON);
   return kill_button_;
 }
 
-bool HungRendererDialogView::Accept(bool window_closing) {
-  // Don't do anything if we're being called only because the dialog is being
-  // destroyed and we don't supply a Cancel function...
-  if (window_closing)
-    return true;
-
+bool HungRendererDialogView::Cancel() {
   // Start waiting again for responsiveness.
-  if (hung_pages_table_model_->GetRenderViewHost()) {
+  if (!kill_button_clicked_ &&
+      hung_pages_table_model_->GetRenderViewHost()) {
     hung_pages_table_model_->GetRenderViewHost()
         ->GetWidget()
         ->RestartHangMonitorTimeout();
   }
   return true;
 }
 
-
 bool HungRendererDialogView::UseNewStyleForThisDialog() const {
 #if defined(OS_WIN)
   // Use the old dialog style without Aero glass, otherwise the dialog will be
   // visually constrained to browser window bounds. See http://crbug.com/323278
   return ui::win::IsAeroGlassEnabled();
 #else
   return views::DialogDelegateView::UseNewStyleForThisDialog();
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, views::ButtonListener implementation:
 
 void HungRendererDialogView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
-  if (sender == kill_button_ &&
-      hung_pages_table_model_->GetRenderProcessHost()) {
-    KillRendererProcess(hung_pages_table_model_->GetRenderProcessHost());
-  }
+  DCHECK_EQ(kill_button_, sender);
+  kill_button_clicked_ = true;
+  content::RenderProcessHost* rph =
+      hung_pages_table_model_->GetRenderProcessHost();
+  if (!rph)
+    return;
+#if defined(OS_WIN)
+  // Try to generate a crash report for the hung process.
+  CrashDumpAndTerminateHungChildProcess(rph->GetHandle());
+#else
+  rph->Shutdown(content::RESULT_CODE_HUNG, false);
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, HungPagesTableModel::Delegate overrides:
 
 void HungRendererDialogView::TabDestroyed() {
   GetWidget()->Close();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 58 matching lines @@
 
 // static
 void HungRendererDialogView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
 }