summaryrefslogtreecommitdiffstats
path: root/chrome_frame/bind_context_info.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:27:29 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:27:29 +0000
commit29c32f903806efbc167a417c170b896dfeecc33f (patch)
tree3c05f7208c27e1affa40d859b573f5a1a6bc66d8 /chrome_frame/bind_context_info.h
parent735f05d9e40970195459ac9136e8e731edea4f32 (diff)
downloadchromium_src-29c32f903806efbc167a417c170b896dfeecc33f.zip
chromium_src-29c32f903806efbc167a417c170b896dfeecc33f.tar.gz
chromium_src-29c32f903806efbc167a417c170b896dfeecc33f.tar.bz2
In ChromeFrame with the IMoniker patch on, we should save away the redirect information received for the initial pending request. This
is to ensure that we inform Chrome about this redirect which can then be followed correctly from Chrome. The other change is to save away the URL being navigated to in the bind context context object. This is also updated if we receive a redirect notification in our callback wrapper. The active document refers this URL if it is available and falls back to the old mechanism of retrieving the URL from the moniker if not. This ensures that optin urls continue to work correctly if the initial page is redirected. Review URL: http://codereview.chromium.org/1523028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bind_context_info.h')
-rw-r--r--chrome_frame/bind_context_info.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome_frame/bind_context_info.h b/chrome_frame/bind_context_info.h
index ff409f0..b6dca88 100644
--- a/chrome_frame/bind_context_info.h
+++ b/chrome_frame/bind_context_info.h
@@ -52,11 +52,20 @@ class BindContextInfo : public IUnknown, public CComObjectRoot {
return cache_;
}
+ void set_url(const std::wstring& url) {
+ url_ = url;
+ }
+
+ const std::wstring url() const {
+ return url_;
+ }
+
private:
ScopedComPtr<IStream> cache_;
bool no_cache_;
bool chrome_request_;
bool is_switching_;
+ std::wstring url_;
DISALLOW_COPY_AND_ASSIGN(BindContextInfo);
};