Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5758)

Unified Diff: chrome_frame/utils.h

Issue 6063001: ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/ceee
Patch Set: fix chrome_frame Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ceee/ie/plugin/toolband/tool_band.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/utils.h
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index f29d536b75fccde9ea65621a6aa5924a3f5777cd..773b65f44782abde05a2384526674c8ba57d1f10 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) {
« no previous file with comments | « ceee/ie/plugin/toolband/tool_band.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698