Skip to content
Snippets Groups Projects
Commit 94ca40f2 authored by ananta@chromium.org's avatar ananta@chromium.org
Browse files

Merge 75704 - Fix for the chrome frame anchor url navigation test failures....

Merge 75704 - Fix for the chrome frame anchor url navigation test failures. Fix is to append the anchor
portion of the url retrieved from the navigation manager to the url retrieved from the
protocol sink wrapper. This is needed as the protocol sink wrapper sees the url without
the anchor portion.

BUG=71860
TEST=ChromeFrame anchor url tests.

TBR=amit
Review URL: http://codereview.chromium.org/6546081

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/6579015

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75803 0039d316-1c4b-4281-b951-d872f2087c98
parent 33bc4b4a
No related branches found
No related tags found
No related merge requests found
......@@ -248,6 +248,17 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable,
DCHECK(info);
if (info && !info->GetUrl().empty()) {
url = info->GetUrl();
if (mgr) {
// If the original URL contains an anchor, then the URL queried
// from the protocol sink wrapper does not contain the anchor. To
// workaround this we retrieve the anchor from the navigation manager
// and append it to the url retrieved from the protocol sink wrapper.
GURL url_for_anchor(mgr->url());
if (url_for_anchor.has_ref()) {
url += L"#";
url += UTF8ToWide(url_for_anchor.ref());
}
}
} else {
// If the original URL contains an anchor, then the URL queried
// from the moniker does not contain the anchor. To workaround
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment