Index: chrome/common/url_constants.h |
=================================================================== |
--- chrome/common/url_constants.h (revision 65039) |
+++ chrome/common/url_constants.h (working copy) |
@@ -41,6 +41,7 @@ |
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 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 @@ |
// 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[]; |