diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 15:50:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 15:50:30 +0000 |
| commit | 965722ff0e981ac0775648460be766c829a10a2b (patch) | |
| tree | 7d8cd2362a1f216eb64aca9ffaefa3d0774e58dd /chrome_frame/bind_context_info.h | |
| parent | 41a95c41d16de968f5d1b02f1ffcccc287147825 (diff) | |
| download | chromium_src-965722ff0e981ac0775648460be766c829a10a2b.zip chromium_src-965722ff0e981ac0775648460be766c829a10a2b.tar.gz chromium_src-965722ff0e981ac0775648460be766c829a10a2b.tar.bz2 | |
Remove scoped_bstr_win, fix all callers to use the new location.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3748012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bind_context_info.h')
| -rw-r--r-- | chrome_frame/bind_context_info.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome_frame/bind_context_info.h b/chrome_frame/bind_context_info.h index 4b08505..91ff5c3 100644 --- a/chrome_frame/bind_context_info.h +++ b/chrome_frame/bind_context_info.h @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_FRAME_BIND_CONTEXT_INFO_ -#define CHROME_FRAME_BIND_CONTEXT_INFO_ +#ifndef CHROME_FRAME_BIND_CONTEXT_INFO_H_ +#define CHROME_FRAME_BIND_CONTEXT_INFO_H_ #include <atlbase.h> #include <atlcom.h> -#include "base/scoped_bstr_win.h" -#include "base/scoped_comptr_win.h" +#include "base/win/scoped_comptr.h" #include "chrome_frame/protocol_sink_wrap.h" class __declspec(uuid("71CC3EC7-7E8A-457f-93BC-1090CF31CC18")) @@ -104,15 +103,15 @@ class __declspec(uuid("00000000-0000-0000-0000-000000000000")) BindContextInfo HRESULT Initialize(IBindCtx* bind_ctx); private: - ScopedComPtr<IStream> cache_; + base::win::ScopedComPtr<IStream> cache_; bool no_cache_; bool chrome_request_; bool is_switching_; std::wstring url_; - ScopedComPtr<IUnknown> ftm_; + base::win::ScopedComPtr<IUnknown> ftm_; scoped_refptr<ProtData> prot_data_; DISALLOW_COPY_AND_ASSIGN(BindContextInfo); }; -#endif // CHROME_FRAME_BIND_CONTEXT_INFO_ +#endif // CHROME_FRAME_BIND_CONTEXT_INFO_H_ |