Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2699)

Unified Diff: chrome/browser/dom_ui/dom_ui_factory.cc

Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698