diff options
Diffstat (limited to 'chrome_frame/protocol_sink_wrap.h')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/protocol_sink_wrap.h b/chrome_frame/protocol_sink_wrap.h index 17f06bc..0d837a0aa 100644 --- a/chrome_frame/protocol_sink_wrap.h +++ b/chrome_frame/protocol_sink_wrap.h @@ -15,8 +15,8 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "base/scoped_comptr_win.h" -#include "base/scoped_bstr_win.h" +#include "base/win/scoped_comptr.h" +#include "base/win/scoped_bstr.h" #include "googleurl/src/gurl.h" #include "chrome_frame/chrome_frame_delegate.h" #include "chrome_frame/http_negotiate.h" @@ -68,7 +68,7 @@ BEGIN_COM_MAP(ProtocolSinkWrap) COM_INTERFACE_BLIND_DELEGATE() END_COM_MAP() - static ScopedComPtr<IInternetProtocolSink> CreateNewSink( + static base::win::ScopedComPtr<IInternetProtocolSink> CreateNewSink( IInternetProtocolSink* sink, ProtData* prot_data); // Apparently this has to be public, to satisfy COM_INTERFACE_BLIND_DELEGATE @@ -95,8 +95,8 @@ END_COM_MAP() HRESULT ObtainServiceProvider(); // Remember original sink - ScopedComPtr<IInternetProtocolSink> delegate_; - ScopedComPtr<IServiceProvider> delegate_service_provider_; + base::win::ScopedComPtr<IInternetProtocolSink> delegate_; + base::win::ScopedComPtr<IServiceProvider> delegate_service_provider_; scoped_refptr<ProtData> prot_data_; DISALLOW_COPY_AND_ASSIGN(ProtocolSinkWrap); }; @@ -149,7 +149,7 @@ class ProtData : public base::RefCounted<ProtData> { InternetProtocol_Read_Fn read_fun_; // What BINDSTATUS_MIMETYPEAVAILABLE and Co. tells us. - ScopedBstr suggested_mime_type_; + base::win::ScopedBstr suggested_mime_type_; // At least one of the following has been received: // BINDSTATUS_MIMETYPEAVAILABLE, // MIMESTATUS_VERIFIEDMIMETYPEAVAILABLE |