From 0152b51eff5f4644531a430974fc3e7a88ca370b Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 21 Dec 2010 00:52:03 +0000 Subject: ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h Also add base::win:: to ScopedComPtr where necessary. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6063001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69775 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/utils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome_frame/utils.h') diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index f29d536..773b65f 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -17,6 +17,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/thread.h" +#include "base/win/scoped_comptr.h" #include "gfx/rect.h" #include "googleurl/src/gurl.h" @@ -288,7 +289,7 @@ HRESULT DoQueryService(const IID& service_id, IUnknown* unk, T** service) { if (!unk) return E_INVALIDARG; - ScopedComPtr service_provider; + base::win::ScopedComPtr service_provider; HRESULT hr = service_provider.QueryFrom(unk); if (service_provider) hr = service_provider->QueryService(service_id, service); @@ -362,7 +363,7 @@ STDMETHODIMP QueryInterfaceIfDelegateSupports(void* obj, REFIID iid, T* instance = reinterpret_cast(obj); IUnknown* delegate = instance ? instance->delegate() : NULL; if (delegate) { - ScopedComPtr original; + base::win::ScopedComPtr original; hr = delegate->QueryInterface(iid, reinterpret_cast(original.Receive())); if (original) { -- cgit v1.1