diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 11:17:05 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 11:17:05 +0000 |
| commit | c1bbaa8facd0471060ff4c21b5628e38cfcb3a9c (patch) | |
| tree | 007df9eaed0a15893e82b06a6c8be8a558d5b730 /chrome/common/url_constants.h | |
| parent | 592b68b097ae2028a100f2aacb416ac015968de9 (diff) | |
| download | chromium_src-c1bbaa8facd0471060ff4c21b5628e38cfcb3a9c.zip chromium_src-c1bbaa8facd0471060ff4c21b5628e38cfcb3a9c.tar.gz chromium_src-c1bbaa8facd0471060ff4c21b5628e38cfcb3a9c.tar.bz2 | |
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
Diffstat (limited to 'chrome/common/url_constants.h')
| -rw-r--r-- | chrome/common/url_constants.h | 3 |
1 files changed, 3 insertions, 0 deletions
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[]; |