diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 20:28:54 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 20:28:54 +0000 |
| commit | 7a6ac5e326a2523a6485aec9b0480ecb5eb3344f (patch) | |
| tree | 03d1d7b10528300c80419a6125506612b12aa49c | |
| parent | 54d52de2695beb7ce40ae389a41756833fab889d (diff) | |
| download | chromium_src-7a6ac5e326a2523a6485aec9b0480ecb5eb3344f.zip chromium_src-7a6ac5e326a2523a6485aec9b0480ecb5eb3344f.tar.gz chromium_src-7a6ac5e326a2523a6485aec9b0480ecb5eb3344f.tar.bz2 | |
Content-initiated navigations from chrome:// pages to chrome:// pages in a new tab must be browser navigations.
BUG=106132
TEST=Chrome os chrome://settings/about page "open source" links work.
Review URL: http://codereview.chromium.org/8769026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113005 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 495414a..776e35c 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -573,26 +573,32 @@ bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, // TODO(erikkay) This is happening inside of a check to is_content_initiated // which means that things like the back button won't trigger it. Is that // OK? - if (!CrossesExtensionExtents(frame, url, is_initial_navigation)) - return false; - - // Include the referrer in this case since we're going from a hosted web - // page. (the packaged case is handled previously by the extension - // navigation test) - *send_referrer = true; - - if (is_content_initiated) { - const Extension* extension = - extension_dispatcher_->extensions()->GetByURL(ExtensionURLInfo(url)); - if (extension && extension->is_app()) { - UMA_HISTOGRAM_ENUMERATION( - extension_misc::kAppLaunchHistogram, - extension_misc::APP_LAUNCH_CONTENT_NAVIGATION, - extension_misc::APP_LAUNCH_BUCKET_BOUNDARY); + if (CrossesExtensionExtents(frame, url, is_initial_navigation)) { + // Include the referrer in this case since we're going from a hosted web + // page. (the packaged case is handled previously by the extension + // navigation test) + *send_referrer = true; + + if (is_content_initiated) { + const Extension* extension = + extension_dispatcher_->extensions()->GetByURL(ExtensionURLInfo(url)); + if (extension && extension->is_app()) { + UMA_HISTOGRAM_ENUMERATION( + extension_misc::kAppLaunchHistogram, + extension_misc::APP_LAUNCH_CONTENT_NAVIGATION, + extension_misc::APP_LAUNCH_BUCKET_BOUNDARY); + } } + return true; } - return true; + // Navigating to a new chrome:// scheme (in a new tab) from within a + // chrome:// page must be a browser navigation so that the browser can + // register the new associated data source. + if (is_content_initiated && url.SchemeIs(kChromeUIScheme)) + return true; + + return false; } bool ChromeContentRendererClient::WillSendRequest(WebKit::WebFrame* frame, |