| Index: chrome/common/url_constants.cc
|
| ===================================================================
|
| --- chrome/common/url_constants.cc (revision 65039)
|
| +++ chrome/common/url_constants.cc (working copy)
|
| @@ -49,6 +49,7 @@
|
| 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 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 @@
|
| // 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";
|
|
|