diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 05:26:39 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 05:26:39 +0000 |
| commit | 85686764474407514d43713e7b8d571e9bfecdfa (patch) | |
| tree | 14306db9972eaae1e8c6069024c331edf6e699ec /chrome_frame | |
| parent | 55ced00ccfde8ae97e345f74b7903cc0317c6b57 (diff) | |
| download | chromium_src-85686764474407514d43713e7b8d571e9bfecdfa.zip chromium_src-85686764474407514d43713e7b8d571e9bfecdfa.tar.gz chromium_src-85686764474407514d43713e7b8d571e9bfecdfa.tar.bz2 | |
Initialize the ChromeFrame request manager with the container interface in the constructor instead of FinalConstruct as there are
codepaths in which the base FinalConstruct is not called.
Bug=44465
Review URL: http://codereview.chromium.org/2093011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 2b74293..f6e3a90 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -176,9 +176,11 @@ class ATL_NO_VTABLE ChromeFrameActivexBase : // NOLINT ChromeFrameActivexBase() : ready_state_(READYSTATE_UNINITIALIZED) { m_bWindowOnly = TRUE; + url_fetcher_.set_container(static_cast<IDispatch*>(this)); } ~ChromeFrameActivexBase() { + url_fetcher_.set_container(NULL); } DECLARE_OLEMISC_STATUS(OLEMISC_RECOMPOSEONRESIZE | OLEMISC_CANTLINKINSIDE | @@ -260,7 +262,6 @@ END_MSG_MAP() IE_8, IE_8 + 1); } - url_fetcher_.set_container(static_cast<IDispatch*>(this)); return S_OK; } |