diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome/browser/platform_util_win.cc | |
parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/platform_util_win.cc')
-rw-r--r-- | chrome/browser/platform_util_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index bd1cf9c..94d82eb 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -13,14 +13,14 @@ #include "app/win/shell.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/path_service.h" #include "base/logging.h" -#include "base/scoped_comptr_win.h" +#include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" -#include "chrome/installer/util/google_update_settings.h" +#include "base/win/scoped_comptr.h" #include "chrome/installer/util/google_update_constants.h" +#include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" #include "googleurl/src/gurl.h" #include "ui/base/message_box_win.h" @@ -64,7 +64,7 @@ void ShowItemInFolder(const FilePath& full_path) { return; } - ScopedComPtr<IShellFolder> desktop; + base::win::ScopedComPtr<IShellFolder> desktop; HRESULT hr = SHGetDesktopFolder(desktop.Receive()); if (FAILED(hr)) return; |