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/browser/site_instance_impl.cc | |
| 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/browser/site_instance_impl.cc')
| -rw-r--r-- | content/browser/site_instance_impl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc index feb5402..1212c17 100644 --- a/content/browser/site_instance_impl.cc +++ b/content/browser/site_instance_impl.cc @@ -27,8 +27,10 @@ static bool IsURLSameAsAnySiteInstance(const GURL& url) { if (url.SchemeIs(chrome::kJavaScriptScheme)) return true; - return - content::GetContentClient()->browser()->IsURLSameAsAnySiteInstance(url); + return url == GURL(chrome::kChromeUICrashURL) || + url == GURL(chrome::kChromeUIKillURL) || + url == GURL(chrome::kChromeUIHangURL) || + url == GURL(chrome::kChromeUIShorthangURL); } int32 SiteInstanceImpl::next_site_instance_id_ = 1; |