Index: chrome/browser/ui/webui/hung_renderer_dialog.cc |
diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc |
index 0bdfa6acf8c310d2edfc19c774122e78e7e62b6d..5f9adbb2f02278da2024fb634a367c39e783e658 100644 |
--- a/chrome/browser/ui/webui/hung_renderer_dialog.cc |
+++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc |
@@ -11,6 +11,7 @@ |
#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/common/logging_chrome.h" |
#include "chrome/common/url_constants.h" |
#include "content/browser/renderer_host/render_view_host.h" |
@@ -29,22 +30,32 @@ 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; |
+ if (ChromeWebUI::IsMoreWebUI()) { |
+ if (!logging::DialogsAreSuppressed()) { |
+ if (!g_instance) { |
+ g_instance = new HungRendererDialog(); |
+ } else { |
+ NOTIMPLEMENTED() << " ShowHungRendererDialog called twice."; |
+ return; |
+ } |
+ g_instance->ShowDialog(NULL, contents); |
} |
- g_instance->ShowDialog(NULL, contents); |
+ return; |
} |
+ |
+ ShowNativeHungRendererDialog(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 (ChromeWebUI::IsMoreWebUI()) { |
+ if (!logging::DialogsAreSuppressed() && g_instance) { |
+ // TODO(wyck): Hide the webui hung renderer dialog. |
+ NOTIMPLEMENTED() << " TODO: Hide the webui hung renderer dialog."; |
+ } |
+ return; |
} |
+ |
+ HideNativeHungRendererDialog(contents); |
} |
} // namespace browser |