| Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc
|
| diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
|
| index 813e153c9f9bcff6f2fd2f51fceb016748f0021b..09aec3fdf5f5541d31dbe22d4fc6dab26a011154 100644
|
| --- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
|
| +++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
|
| @@ -25,6 +25,7 @@
|
| #include "chrome/browser/ui/webui/history2_ui.h"
|
| #include "chrome/browser/ui/webui/history_ui.h"
|
| #include "chrome/browser/ui/webui/html_dialog_ui.h"
|
| +#include "chrome/browser/ui/webui/hung_renderer_dialog_ui.h"
|
| #include "chrome/browser/ui/webui/media/media_internals_ui.h"
|
| #include "chrome/browser/ui/webui/net_internals_ui.h"
|
| #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
|
| @@ -69,14 +70,10 @@
|
| #include "chrome/browser/ui/webui/conflicts_ui.h"
|
| #endif
|
|
|
| -#if defined(WEBUI_DIALOGS) && defined(OS_POSIX) && !defined(OS_MACOSX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| #include "chrome/browser/ui/webui/certificate_viewer_ui.h"
|
| #endif
|
|
|
| -#if defined(WEBUI_DIALOGS)
|
| -#include "chrome/browser/ui/webui/hung_renderer_dialog_ui.h"
|
| -#endif
|
| -
|
| namespace {
|
|
|
| // A function for creating a new WebUI. The caller owns the return value, which
|
| @@ -151,15 +148,13 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
|
| return &NewWebUI<BookmarksUI>;
|
| if (url.host() == chrome::kChromeUIBugReportHost)
|
| return &NewWebUI<BugReportUI>;
|
| -#if defined(WEBUI_DIALOGS) && defined(OS_POSIX) && !defined(OS_MACOSX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| if (url.host() == chrome::kChromeUICertificateViewerHost)
|
| return &NewWebUI<CertificateViewerUI>;
|
| #endif
|
| -#if defined(WEBUI_DIALOGS)
|
| if (url.host() == chrome::kChromeUIHungRendererDialogHost) {
|
| return &NewWebUI<HungRendererDialogUI>;
|
| }
|
| -#endif
|
| if (url.host() == chrome::kChromeUICrashesHost)
|
| return &NewWebUI<CrashesUI>;
|
| if (url.host() == chrome::kChromeUIDevToolsHost)
|
|
|