| Index: chrome/browser/dom_ui/dom_ui_factory.cc
|
| ===================================================================
|
| --- chrome/browser/dom_ui/dom_ui_factory.cc (revision 65039)
|
| +++ chrome/browser/dom_ui/dom_ui_factory.cc (working copy)
|
| @@ -51,6 +51,10 @@
|
| #include "chrome/browser/dom_ui/mediaplayer_ui.h"
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +#include "chrome/browser/dom_ui/conflicts_ui.h"
|
| +#endif
|
| +
|
| const DOMUITypeID DOMUIFactory::kNoDOMUI = NULL;
|
|
|
| // A function for creating a new DOMUI. The caller owns the return value, which
|
| @@ -131,6 +135,10 @@
|
| return &NewDOMUI<BugReportUI>;
|
| if (url.host() == chrome::kChromeUIDevToolsHost)
|
| return &NewDOMUI<DevToolsUI>;
|
| +#if defined(OS_WIN)
|
| + if (url.host() == chrome::kChromeUIConflictsHost)
|
| + return &NewDOMUI<ConflictsUI>;
|
| +#endif
|
| if (url.host() == chrome::kChromeUIDownloadsHost)
|
| return &NewDOMUI<DownloadsUI>;
|
| if (url.host() == chrome::kChromeUITextfieldsHost)
|
| @@ -271,6 +279,11 @@
|
| if (!HasDOMUIScheme(page_url))
|
| return NULL;
|
|
|
| +#if defined(OS_WIN)
|
| + if (page_url.host() == chrome::kChromeUIConflictsHost)
|
| + return ConflictsUI::GetFaviconResourceBytes();
|
| +#endif
|
| +
|
| if (page_url.host() == chrome::kChromeUIDownloadsHost)
|
| return DownloadsUI::GetFaviconResourceBytes();
|
|
|
|
|