diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 23:27:27 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 23:27:27 +0000 |
| commit | 4f45d458c94df1f27a8e1091387821a71f0b2a91 (patch) | |
| tree | 6204e1f4103b824a8a1eb077290ade4303f10b6e /chrome_frame/urlmon_bind_status_callback.cc | |
| parent | 5efbfe01100407ead12b18daae9ccafe34eeedc5 (diff) | |
| download | chromium_src-4f45d458c94df1f27a8e1091387821a71f0b2a91.zip chromium_src-4f45d458c94df1f27a8e1091387821a71f0b2a91.tar.gz chromium_src-4f45d458c94df1f27a8e1091387821a71f0b2a91.tar.bz2 | |
If we switch into ChromeFrame as a result of a redirect then we need to navigate chrome to
the correct URL to ensure that scripts on the page see the correct URL. This functionality
regressed when the protocol sink patch landed.
Fix is to read the URL from the ProtData object which wraps the underlying protocol sink,
when our active document loads.
Removed stale code from the Chromeframe moniker patch which eventually needs to go.
Fixes bug http://code.google.com/p/chromium/issues/detail?can=2&q=71860
BUG=71860
TEST=As described in the bug.
Review URL: http://codereview.chromium.org/6469103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_bind_status_callback.cc')
| -rw-r--r-- | chrome_frame/urlmon_bind_status_callback.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome_frame/urlmon_bind_status_callback.cc b/chrome_frame/urlmon_bind_status_callback.cc index 34520ef..f060155 100644 --- a/chrome_frame/urlmon_bind_status_callback.cc +++ b/chrome_frame/urlmon_bind_status_callback.cc @@ -249,15 +249,10 @@ STDMETHODIMP BSCBStorageBind::OnProgress(ULONG progress, ULONG progress_max, HRESULT hr = S_OK; - // Remember the last redirected URL in case we get switched into - // chrome frame - if (status_code == BINDSTATUS_REDIRECTING) { - ScopedComPtr<BindContextInfo> info; - BindContextInfo::FromBindContext(bind_ctx_, info.Receive()); - DCHECK(info); - if (info) - info->set_url(status_text); - } + // TODO(ananta) + // ChromeFrame will not be informed of any redirects which occur while we + // switch into Chrome. This will only break the moniker patch which is + // legacy and needs to be deleted. if (ShouldCacheProgress(status_code)) { saved_progress_.push_back(new Progress(progress, progress_max, status_code, |