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/utils.cc | |
| 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/utils.cc')
| -rw-r--r-- | chrome_frame/utils.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 6af8560..a959adf 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -16,9 +16,6 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/scoped_bstr_win.h" -#include "base/scoped_comptr_win.h" -#include "base/scoped_variant_win.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" #include "base/string_util.h" @@ -26,6 +23,9 @@ #include "base/thread_local.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" +#include "base/win/scoped_bstr.h" +#include "base/win/scoped_comptr.h" +#include "base/win/scoped_variant.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/chrome_frame_distribution.h" @@ -40,6 +40,8 @@ #include "net/http/http_util.h" using base::win::RegKey; +using base::win::ScopedComPtr; +using base::win::ScopedVariant; // Note that these values are all lower case and are compared to // lower-case-transformed values. @@ -462,7 +464,7 @@ FilePath GetIETemporaryFilesFolder() { SHGDN_NORMAL | SHGDN_FORPARSING, &path); DCHECK(SUCCEEDED(hr)); - ScopedBstr temp_internet_files_bstr; + base::win::ScopedBstr temp_internet_files_bstr; StrRetToBSTR(&path, relative_pidl, temp_internet_files_bstr.Receive()); FilePath temp_internet_files(static_cast<BSTR>(temp_internet_files_bstr)); ILFree(tif_pidl); |