First cut of the about:conflicts page, listing all DLLs loaded in the Chrome process.

BUG=http://crbug.com/51105, http://crbug.com/57239
TEST=Unit tests included.

Review URL: http://codereview.chromium.org/4524002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65366 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 0 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 438c0c0..4160bc0 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -100,6 +100,10 @@ const char kCloudPrintProxyId[]             = "cloud-print-proxy-id";
 // print service has been enabled (see enable-cloud-print).
 const char kCloudPrintServiceURL[]          = "cloud-print-service";
 
+// Causes the browser process to inspect loaded and registered DLLs for
+// known conflicts and warn the user.
+const char kConflictingModulesCheck[]       = "conflicting-modules-check";
+
 // The Country we should use.  This is normally obtained from the operating
 // system during first run and cached in the preferences afterwards.  This is a
 // string value, the 2 letter code from ISO 3166-1.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index c68b16f..5a537ce 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -42,6 +42,7 @@ extern const char kCheckForUpdateIntervalSec[];
 extern const char kChromeFrame[];
 extern const char kCloudPrintProxyId[];
 extern const char kCloudPrintServiceURL[];
+extern const char kConflictingModulesCheck[];
 extern const char kCountry[];
 extern const char kDebugPrint[];
 extern const char kDiagnostics[];
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index e9127a7b..afbb5f6 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -1017,6 +1017,17 @@ class NotificationType {
     // expected.
     UPGRADE_RECOMMENDED,
 
+    // Software incompatibility notifications ----------------------------------
+
+    // Sent when Chrome has finished compiling the list of loaded modules (and
+    // other modules of interest). No details are expected.
+    MODULE_LIST_ENUMERATED,
+
+    // Sent when Chrome detects an incompatible module. Details is a boolean
+    // specifying true if one or more confirmed bad modules were found or false
+    // if only suspected bad modules were found.
+    MODULE_INCOMPATIBILITY_DETECTED,
+
     // Accessibility Notifications ---------------------------------------------
 
     // Notification that a window in the browser UI (not the web content)
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 897fa72..427c933 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -49,6 +49,7 @@ const char kAboutAboutURL[] = "about:about";
 const char kAboutAppCacheInternalsURL[] = "about:appcache-internals";
 const char kAboutBlankURL[] = "about:blank";
 const char kAboutCacheURL[] = "about:cache";
+const char kAboutConflicts[] = "about:conflicts";
 const char kAboutCrashURL[] = "about:crash";
 const char kAboutCreditsURL[] = "about:credits";
 const char kAboutDNSURL[] = "about:dns";
@@ -74,6 +75,7 @@ const char kChromeUIAboutURL[] = "chrome://settings/about";
 const char kChromeUIAppLauncherURL[] = "chrome://newtab/#mode=app-launcher";
 const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";
 const char kChromeUIBugReportURL[] = "chrome://bugreport/";
+const char kChromeUIConflictsURL[] = "chrome://conflicts/";
 const char kChromeUIConstrainedHTMLTestURL[] = "chrome://constrained-test/";
 const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/";
 const char kChromeUIDownloadsURL[] = "chrome://downloads/";
@@ -104,6 +106,7 @@ const char kChromeUISystemInfoURL[] = "chrome://system/";
 // Keep this list sorted please.
 const char kChromeUIBookmarksHost[] = "bookmarks";
 const char kChromeUIBugReportHost[] = "bugreport";
+const char kChromeUIConflictsHost[] = "conflicts";
 const char kChromeUIDevToolsHost[] = "devtools";
 const char kChromeUIDialogHost[] = "dialog";
 const char kChromeUIDownloadsHost[] = "downloads";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 620cae6..05e32e6 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -41,6 +41,7 @@ extern const char kAboutAboutURL[];
 extern const char kAboutAppCacheInternalsURL[];
 extern const char kAboutBlankURL[];
 extern const char kAboutBrowserCrash[];
+extern const char kAboutConflicts[];
 extern const char kAboutCacheURL[];
 extern const char kAboutCrashURL[];
 extern const char kAboutCreditsURL[];
@@ -65,6 +66,7 @@ extern const char kChromeUIAboutURL[];
 extern const char kChromeUIAppLauncherURL[];
 extern const char kChromeUIBookmarksURL[];
 extern const char kChromeUIBugReportURL[];
+extern const char kChromeUIConflictsURL[];
 extern const char kChromeUIConstrainedHTMLTestURL[];
 extern const char kChromeUIDevToolsURL[];
 extern const char kChromeUIDownloadsURL[];
@@ -96,6 +98,7 @@ extern const char kChromeUISystemInfoURL[];
 // above.
 extern const char kChromeUIBookmarksHost[];
 extern const char kChromeUIBugReportHost[];
+extern const char kChromeUIConflictsHost[];
 extern const char kChromeUIDevToolsHost[];
 extern const char kChromeUIDialogHost[];
 extern const char kChromeUIDownloadsHost[];