diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 01:22:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 01:22:18 +0000 |
| commit | 8bf104801369f43387e7538b5ed208f352e3b26b (patch) | |
| tree | 7f67c8c956f9bf291a12732062d3d356d8fce34b /content/public/common | |
| parent | 4cf2c47ec98b7203686672d872b6e6df5c1319bf (diff) | |
| download | chromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.zip chromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.tar.gz chromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.tar.bz2 | |
Move handling of debug urls like chrome://crash, chrome://gpuclean to content. These are for testing the content layer, so they belong there. This allows us to hide GpuProcessHostUIShim from chrome.
I cleaned up the about_handler.* files which were overly complicated. I also was able to remove a method from ContentBrowserClient.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9349010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/common')
| -rw-r--r-- | content/public/common/url_constants.cc | 9 | ||||
| -rw-r--r-- | content/public/common/url_constants.h | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index 2c046d4..30f8ec3 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -44,7 +44,14 @@ const char kViewSourceScheme[] = "view-source"; const char kStandardSchemeSeparator[] = "://"; const char kAboutBlankURL[] = "about:blank"; -const char kAboutCrashURL[] = "about:crash"; +const char kChromeUIBrowserCrashHost[] = "inducebrowsercrashforrealz"; +const char kChromeUICrashURL[] = "chrome://crash/"; +const char kChromeUIGpuCleanURL[] = "chrome://gpuclean"; +const char kChromeUIGpuCrashURL[] = "chrome://gpucrash"; +const char kChromeUIGpuHangURL[] = "chrome://gpuhang"; +const char kChromeUIHangURL[] = "chrome://hang/"; +const char kChromeUIKillURL[] = "chrome://kill/"; +const char kChromeUIShorthangURL[] = "chrome://shorthang/"; const char kUnreachableWebDataURL[] = "chrome://chromewebdata/"; diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index 2c02972..cf910c0 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -10,6 +10,7 @@ #include "content/common/content_export.h" +// TODO(jam): rename this to content. namespace chrome { // Null terminated list of schemes that are savable. This function can be @@ -41,7 +42,14 @@ CONTENT_EXPORT extern const char kStandardSchemeSeparator[]; // About URLs (including schemes). CONTENT_EXPORT extern const char kAboutBlankURL[]; -CONTENT_EXPORT extern const char kAboutCrashURL[]; +CONTENT_EXPORT extern const char kChromeUIBrowserCrashHost[]; +CONTENT_EXPORT extern const char kChromeUICrashURL[]; +CONTENT_EXPORT extern const char kChromeUIGpuCleanURL[]; +CONTENT_EXPORT extern const char kChromeUIGpuCrashURL[]; +CONTENT_EXPORT extern const char kChromeUIGpuHangURL[]; +CONTENT_EXPORT extern const char kChromeUIHangURL[]; +CONTENT_EXPORT extern const char kChromeUIKillURL[]; +CONTENT_EXPORT extern const char kChromeUIShorthangURL[]; // Special URL used to start a navigation to an error page. extern const char kUnreachableWebDataURL[]; |