Implement function that hides the WebUI Hung Renderer Dialog.

chrome/browser/ui/webui/hung_renderer_dialog.cc

 // Copyright (c) 2011 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/webui/hung_renderer_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/result_codes.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "views/widget/widget.h"
 
 namespace {
 HungRendererDialog* g_instance = NULL;
 const int kHungRendererDialogWidth = 425;
 const int kHungRendererDialogHeight = 200;
 }
 
 namespace browser {
 
 void ShowHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed()) {
     if (!g_instance) {
       g_instance = new HungRendererDialog();
     } else {
       NOTIMPLEMENTED() << " ShowHungRendererDialog called twice.";
       return;
     }
     g_instance->ShowDialog(NULL, contents);
   }
 }
 
 void HideHungRendererDialog(TabContents* contents) {
-  if (!logging::DialogsAreSuppressed() && g_instance) {
-    // TODO(wyck): Hide the webui hung renderer dialog.
-    NOTIMPLEMENTED() << " TODO: Hide the webui hung renderer dialog.";
-  }
+  if (!logging::DialogsAreSuppressed() && g_instance)
+    g_instance->HideDialog(contents);
 }
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialog methods
 
 HungRendererDialog::HungRendererDialog()
-    : contents_(NULL) {
+    : contents_(NULL),
+      window_(NULL) {
 }
 
 void HungRendererDialog::ShowDialog(gfx::NativeWindow owning_window,
                                     TabContents* contents) {
   DCHECK(contents);
   contents_ = contents;
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
-  browser->BrowserShowHtmlDialog(this, owning_window);
+  window_ = browser->BrowserShowHtmlDialog(this, owning_window);
+}
+
+void HungRendererDialog::HideDialog(TabContents* contents) {
+  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window_);
+  DCHECK(widget);
+  widget->Close();
 }
 
 bool HungRendererDialog::IsDialogModal() const {
   return false;
 }
 
 string16 HungRendererDialog::GetDialogTitle() const {
   return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE);
 }
 
@@ skipping 14 matching lines @@
   return std::string();  // There are no args used.
 }
 
 void HungRendererDialog::OnDialogClosed(const std::string& json_retval) {
   // Figure out what the response was.
   scoped_ptr<Value> root(base::JSONReader::Read(json_retval, false));
   bool response = false;
   ListValue* list;
   if (!root.get() || !root->GetAsList(&list) || !list ||
       !list->GetBoolean(0, &response)) {
-    NOTREACHED() << "json does not describe a valid result";
+    DLOG(INFO) << "json does not describe a valid result";

[wyck, 2011/09/02 15:57:48]

This is now reached when the dialog is closed without clicking a button.

[flackr, 2011/09/02 16:39:55]

Since this is an expected case you should remove this log message (or change it
to sound less like an error case) and comment this if block to say that it
checks if the user chose an action.

[wyck, 2011/09/02 19:18:43]

Done.

   }
 
   if (response) {
     // The user indicated that it is OK to kill the renderer process.
     if (contents_ && contents_->GetRenderProcessHost()) {
       base::KillProcess(contents_->GetRenderProcessHost()->GetHandle(),
                         content::RESULT_CODE_HUNG, false);
     }
   } else {
     // No indication from the user that it is ok to kill anything. Just wait.
     // Start waiting again for responsiveness.
     if (contents_ && contents_->render_view_host())

[flackr, 2011/09/02 16:39:55]

When the dialog is closed by HideDialog, won't this path be triggered (by the
default response value false), in which case it will try to restart a hang
monitor timeout for the already responsive render view host?

[wyck, 2011/09/02 19:18:43]

Fixed by setting |contents_| to NULL before closing in HideDialog (line 71-ish)

       contents_->render_view_host()->RestartHangMonitorTimeout();
   }
 
   g_instance = NULL;
   delete this;
 }
 
 void HungRendererDialog::OnCloseContents(TabContents* source,
                      bool* out_close_dialog) {
   NOTIMPLEMENTED();
@@ skipping 29 matching lines @@
       // Add details for |url| and |title|.
       DictionaryValue* dict = new DictionaryValue();
       dict->SetString("url", it->tab_contents()->GetURL().spec());
       dict->SetString("title", title);
       tab_contents_list.Append(dict);
     }
   }
   // Send list of tab contents details to javascript.
   web_ui_->CallJavascriptFunction("hungRendererDialog.setTabContentsList",
                                   tab_contents_list);
 }

[flackr, 2011/09/02 16:39:55]

Was lint okay with not having a newline here even though it wanted one in the .h
file?

[wyck, 2011/09/02 19:18:43]

Ya, lint didn't mind me removing the newline here. weird.

-