diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:52:03 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:52:03 +0000 |
| commit | 0152b51eff5f4644531a430974fc3e7a88ca370b (patch) | |
| tree | f4c79a33985ccc30f95a6abf2aab919ede57c224 /chrome_frame | |
| parent | 2b7558bfdedd575d472fdb3d632165e96be1d939 (diff) | |
| download | chromium_src-0152b51eff5f4644531a430974fc3e7a88ca370b.zip chromium_src-0152b51eff5f4644531a430974fc3e7a88ca370b.tar.gz chromium_src-0152b51eff5f4644531a430974fc3e7a88ca370b.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/utils.h | 5 |
1 files changed, 3 insertions, 2 deletions
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<IServiceProvider> service_provider; + base::win::ScopedComPtr<IServiceProvider> 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<T*>(obj); IUnknown* delegate = instance ? instance->delegate() : NULL; if (delegate) { - ScopedComPtr<IUnknown> original; + base::win::ScopedComPtr<IUnknown> original; hr = delegate->QueryInterface(iid, reinterpret_cast<void**>(original.Receive())); if (original) { |