Index: chrome/browser/browser_about_handler.cc |
=================================================================== |
--- chrome/browser/browser_about_handler.cc (revision 65039) |
+++ chrome/browser/browser_about_handler.cc (working copy) |
@@ -64,6 +64,7 @@ |
#endif |
#if defined(OS_WIN) |
+#include "chrome/browser/enumerate_modules_model_win.h" |
#include "chrome/browser/views/about_ipc_dialog.h" |
#elif defined(OS_CHROMEOS) |
#include "chrome/browser/chromeos/cros/cros_library.h" |
@@ -101,6 +102,9 @@ |
const char kBlobInternalsPath[] = "blob-internals"; |
const char kCreditsPath[] = "credits"; |
const char kCachePath[] = "view-http-cache"; |
+#if defined(OS_WIN) |
+const char kConflictsPath[] = "conflicts"; |
+#endif |
const char kDnsPath[] = "dns"; |
const char kFlagsPath[] = "flags"; |
const char kGpuPath[] = "gpu"; |
@@ -134,6 +138,9 @@ |
kBlobInternalsPath, |
kCachePath, |
kCreditsPath, |
+#if defined(OS_WIN) |
+ kConflictsPath, |
+#endif |
kDnsPath, |
kFlagsPath, |
kGpuPath, |
@@ -263,6 +270,9 @@ |
if (kAllAboutPaths[i] == kAppCacheInternalsPath || |
kAllAboutPaths[i] == kBlobInternalsPath || |
kAllAboutPaths[i] == kCachePath || |
+#if defined(OS_WIN) |
+ kAllAboutPaths[i] == kConflictsPath || |
+#endif |
kAllAboutPaths[i] == kFlagsPath || |
kAllAboutPaths[i] == kNetInternalsPath || |
kAllAboutPaths[i] == kPluginsPath) { |
@@ -1085,6 +1095,14 @@ |
return true; |
} |
+#if defined(OS_WIN) |
+ // Rewrite about:conflicts/* URLs to chrome://conflicts/* |
+ if (StartsWithAboutSpecifier(*url, chrome::kAboutConflicts)) { |
+ *url = GURL(chrome::kChromeUIConflictsURL); |
+ return true; |
+ } |
+#endif |
+ |
// Rewrite about:flags and about:vaporware to chrome://flags/. |
if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutFlagsURL) || |
LowerCaseEqualsASCII(url->spec(), chrome::kAboutVaporwareURL)) { |