summaryrefslogtreecommitdiffstats
path: root/chrome_frame/urlmon_url_request.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/urlmon_url_request.h')
-rw-r--r--chrome_frame/urlmon_url_request.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index 676aa3b..f17af4c 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -52,7 +52,6 @@ class UrlmonUrlRequestManager
// Returns a copy of the url privacy information for this instance.
PrivacyInfo privacy_info() {
- AutoLock lock(privacy_info_lock_);
return privacy_info_;
}
@@ -71,6 +70,10 @@ class UrlmonUrlRequestManager
privileged_mode_ = privileged_mode;
}
+ void set_container(IUnknown* container) {
+ container_ = container;
+ }
+
private:
friend class MessageLoop;
friend struct RunnableMethodTraits<UrlmonUrlRequestManager>;
@@ -115,12 +118,14 @@ class UrlmonUrlRequestManager
bool stopping_;
int calling_delegate_; // re-entrancy protection (debug only check)
- Lock privacy_info_lock_;
PrivacyInfo privacy_info_;
// The window to be used to fire notifications on.
HWND notification_window_;
// Set to true if the ChromeFrame instance is running in privileged mode.
bool privileged_mode_;
+ // A pointer to the containing object. We maintain a weak reference to avoid
+ // lifetime issues.
+ IUnknown* container_;
};
#endif // CHROME_FRAME_URLMON_URL_REQUEST_H_