Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

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/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.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) {
-  HungRendererDialog::ShowHungRendererDialog(contents);
+  if (ChromeWebUI::IsMoreWebUI()) {
+    HungRendererDialog::ShowHungRendererDialog(contents);
+    return;
+  }
+
+  ShowNativeHungRendererDialog(contents);
 }
 
 void HideHungRendererDialog(TabContents* contents) {
-  HungRendererDialog::HideHungRendererDialog(contents);
+  if (ChromeWebUI::IsMoreWebUI()) {
+    HungRendererDialog::HideHungRendererDialog(contents);
+    return;
+  }
+
+  HideNativeHungRendererDialog(contents);
 }
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialog public static methods
 
 void HungRendererDialog::ShowHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed()) {
     if (g_instance)
       return;
     g_instance = new HungRendererDialog();
     g_instance->ShowDialog(contents);
   }
 }
 
 void HungRendererDialog::HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->HideDialog(contents);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialog private methods
 
 HungRendererDialog::HungRendererDialog()
     : contents_(NULL),
+      handler_(NULL),
       window_(NULL) {
 }
 
 void HungRendererDialog::ShowDialog(TabContents* contents) {
   DCHECK(contents);
   contents_ = contents;
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
+  handler_ = new HungRendererDialogHandler(contents_);
   window_ = browser->BrowserShowHtmlDialog(this, NULL);
 }
 
 void HungRendererDialog::HideDialog(TabContents* contents) {
   DCHECK(contents);
   // Don't close the dialog if it's a TabContents for some other renderer.
   if (contents_ && contents_->GetRenderProcessHost() !=
       contents->GetRenderProcessHost())
     return;
   // Settings |contents_| to NULL prevents the hang monitor from restarting.
   // We do this because the close dialog handler runs whether it is trigged by
   // the user closing the box, or by being closed externally with widget->Close.
   contents_ = NULL;
-  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window_);
-  DCHECK(widget);
-  widget->Close();
+  DCHECK(handler_);
+  handler_->CloseDialog();
 }
 
 bool HungRendererDialog::IsDialogModal() const {
   return false;
 }
 
 string16 HungRendererDialog::GetDialogTitle() const {
   return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE);
 }
 
 GURL HungRendererDialog::GetDialogContentURL() const {
   return GURL(chrome::kChromeUIHungRendererDialogURL);
 }
 
 void HungRendererDialog::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
-  handlers->push_back(new HungRendererDialogHandler(contents_));
+  handlers->push_back(handler_);
 }
 
 void HungRendererDialog::GetDialogSize(gfx::Size* size) const {
   size->SetSize(kHungRendererDialogWidth, kHungRendererDialogHeight);
 }
 
 std::string HungRendererDialog::GetDialogArgs() const {
   return std::string();  // There are no args used.
 }
 
@@ skipping 32 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogHandler methods
 
 HungRendererDialogHandler::HungRendererDialogHandler(
     TabContents* contents)
   : contents_(contents) {
 }
 
+void HungRendererDialogHandler::CloseDialog() {
+  DCHECK(web_ui_);
+  static_cast<HtmlDialogUI*>(web_ui_)->CloseDialog(NULL);
+}
+
 void HungRendererDialogHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestTabContentsList",
       NewCallback(this,
           &HungRendererDialogHandler::RequestTabContentsList));
 }
 
 void HungRendererDialogHandler::RequestTabContentsList(
     const base::ListValue* args) {
   ListValue tab_contents_list;
   for (TabContentsIterator it; !it.done(); ++it) {
     if (it->tab_contents()->GetRenderProcessHost() ==
         contents_->GetRenderProcessHost()) {
       string16 title = it->tab_contents()->GetTitle();
       if (title.empty())
         title = TabContentsWrapper::GetDefaultTitle();
       // 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);
 }