From 3eb07da6e868e49e28cb5a6d8a57037f2c45a20e Mon Sep 17 00:00:00 2001 From: "stoyan@chromium.org" Date: Mon, 1 Feb 2010 19:48:36 +0000 Subject: TEST=new tests added. Review URL: http://codereview.chromium.org/545093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37728 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame_activex.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'chrome_frame/chrome_frame_activex.cc') diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index e8fa70a..295ceaa 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -42,6 +42,9 @@ ChromeFrameActivex::~ChromeFrameActivex() { DCHECK(onload_.size() == 0); DCHECK(onreadystatechanged_.size() == 0); DCHECK(onextensionready_.size() == 0); + + // ChromeFramePlugin::Uninitialize() + Base::Uninitialize(); } LRESULT ChromeFrameActivex::OnCreate(UINT message, WPARAM wparam, LPARAM lparam, @@ -315,6 +318,8 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( profile_name.assign(profile_name_arg, profile_name_arg.Length()); } + url_fetcher_.set_frame_busting(!is_privileged_); + automation_client_->SetUrlFetcher(&url_fetcher_); if (!InitializeAutomation(profile_name, chrome_extra_arguments, IsIEInPrivate())) { return E_FAIL; -- cgit v1.1