diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 22:45:40 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 22:45:40 +0000 |
| commit | d1f2e93ff399c077d58e02c3799bb2bd817735fa (patch) | |
| tree | f4f147874f6f7993228933c869ac3d0c3125b254 /webkit/default_plugin | |
| parent | 6b75287e69c7c5b42d47d5cc01bb54de37dc9a20 (diff) | |
| download | chromium_src-d1f2e93ff399c077d58e02c3799bb2bd817735fa.zip chromium_src-d1f2e93ff399c077d58e02c3799bb2bd817735fa.tar.gz chromium_src-d1f2e93ff399c077d58e02c3799bb2bd817735fa.tar.bz2 | |
Use ScopedComPtr instead of CComPtr to reduce a dependency on ATL.
BUG=5023
TEST=none
Review URL: http://codereview.chromium.org/190018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin')
| -rw-r--r-- | webkit/default_plugin/activex_installer.cc | 2 | ||||
| -rw-r--r-- | webkit/default_plugin/activex_installer.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/webkit/default_plugin/activex_installer.cc b/webkit/default_plugin/activex_installer.cc index 002c8e1..b7add77 100644 --- a/webkit/default_plugin/activex_installer.cc +++ b/webkit/default_plugin/activex_installer.cc @@ -32,7 +32,7 @@ HRESULT ActiveXInstaller::StartDownload(const std::string& clsid, break; // Create the bind context, register it with myself (status callback). - hr = CreateBindCtx(0, &bind_ctx_); + hr = CreateBindCtx(0, bind_ctx_.Receive()); if (FAILED(hr)) break; BIND_OPTS opts; diff --git a/webkit/default_plugin/activex_installer.h b/webkit/default_plugin/activex_installer.h index 330bc77..3b2ad6a 100644 --- a/webkit/default_plugin/activex_installer.h +++ b/webkit/default_plugin/activex_installer.h @@ -10,6 +10,8 @@ #include <windows.h> #include <string> +#include "base/scoped_comptr_win.h" + // ActiveXInstaller is to help install an ActiveX control from a URL, usually // given by codebase. class ActiveXInstaller : public CComObjectRootEx<CComMultiThreadModel>, @@ -51,14 +53,14 @@ class ActiveXInstaller : public CComObjectRootEx<CComMultiThreadModel>, HWND* phwnd); BEGIN_COM_MAP(ActiveXInstaller) - COM_INTERFACE_ENTRY(IBindStatusCallback) - COM_INTERFACE_ENTRY(IWindowForBindingUI) + COM_INTERFACE_ENTRY(IBindStatusCallback) + COM_INTERFACE_ENTRY(IWindowForBindingUI) END_COM_MAP() private: HWND wnd_; UINT notification_msg_; - CComPtr<IBindCtx> bind_ctx_; + ScopedComPtr<IBindCtx> bind_ctx_; }; #endif // #ifndef WEBKIT_DEFAULT_PLUGIN_ACTIVEX_INSTALLER_H__ |