diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 20:04:07 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 20:04:07 +0000 |
| commit | 530f43f302f1eef9d3530767015891f1db1f1272 (patch) | |
| tree | 2006b20ca4022116b5d8c04784cec8802fb4d262 /chrome/browser/views/shell_dialogs_win.cc | |
| parent | 0b9158f07ac7c5ed1dc1c166e4a1513d6fbbb9e9 (diff) | |
| download | chromium_src-530f43f302f1eef9d3530767015891f1db1f1272.zip chromium_src-530f43f302f1eef9d3530767015891f1db1f1272.tar.gz chromium_src-530f43f302f1eef9d3530767015891f1db1f1272.tar.bz2 | |
Use ScopedComPtr instead of CComPtr to reduce a dependency on ATL.
BUG=5027
TEST=none
Review URL: http://codereview.chromium.org/201012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/shell_dialogs_win.cc')
| -rw-r--r-- | chrome/browser/views/shell_dialogs_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index df15034..5c5b1f9 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -7,7 +7,6 @@ #include <windows.h> #include <commdlg.h> #include <shlobj.h> -#include <atlbase.h> #include <algorithm> #include <set> @@ -17,6 +16,7 @@ #include "app/win_util.h" #include "base/file_util.h" #include "base/registry.h" +#include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" @@ -453,10 +453,10 @@ bool SelectFileDialogImpl::RunSelectFolderDialog(const std::wstring& title, STRRET out_dir_buffer; ZeroMemory(&out_dir_buffer, sizeof(out_dir_buffer)); out_dir_buffer.uType = STRRET_WSTR; - CComPtr<IShellFolder> shell_folder = NULL; - if (SHGetDesktopFolder (&shell_folder) == NOERROR) { + ScopedComPtr<IShellFolder> shell_folder; + if (SHGetDesktopFolder(shell_folder.Receive()) == NOERROR) { HRESULT hr = shell_folder->GetDisplayNameOf(list, SHGDN_FORPARSING, - &out_dir_buffer); + &out_dir_buffer); if (SUCCEEDED(hr) && out_dir_buffer.uType == STRRET_WSTR) { *path = FilePath(out_dir_buffer.pOleStr); CoTaskMemFree(out_dir_buffer.pOleStr); |