diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 19:48:36 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 19:48:36 +0000 |
| commit | 3eb07da6e868e49e28cb5a6d8a57037f2c45a20e (patch) | |
| tree | b9e05e275e38b176b1473e0f9e66075706ca238b /chrome_frame/chrome_frame_activex.cc | |
| parent | 55750b57e30ecc9f3657d1ebd08853e232ba4e23 (diff) | |
| download | chromium_src-3eb07da6e868e49e28cb5a6d8a57037f2c45a20e.zip chromium_src-3eb07da6e868e49e28cb5a6d8a57037f2c45a20e.tar.gz chromium_src-3eb07da6e868e49e28cb5a6d8a57037f2c45a20e.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/chrome_frame_activex.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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; |