Index: chrome/browser/platform_util_win.cc |
=================================================================== |
--- chrome/browser/platform_util_win.cc (revision 90470) |
+++ chrome/browser/platform_util_win.cc (working copy) |
@@ -9,6 +9,8 @@ |
#include <shellapi.h> |
#include <shlobj.h> |
+#include "app/win/scoped_co_mem.h" |
+#include "app/win/shell.h" |
#include "base/file_path.h" |
#include "base/file_util.h" |
#include "base/logging.h" |
@@ -16,11 +18,9 @@ |
#include "base/utf_string_conversions.h" |
#include "base/win/registry.h" |
#include "base/win/scoped_comptr.h" |
-#include "chrome/common/scoped_co_mem.h" |
#include "chrome/installer/util/browser_distribution.h" |
#include "googleurl/src/gurl.h" |
#include "ui/base/message_box_win.h" |
-#include "ui/base/win/shell.h" |
#include "ui/gfx/native_widget_types.h" |
namespace platform_util { |
@@ -66,14 +66,14 @@ |
if (FAILED(hr)) |
return; |
- chrome::common::ScopedCoMem<ITEMIDLIST> dir_item; |
+ app::win::ScopedCoMem<ITEMIDLIST> dir_item; |
hr = desktop->ParseDisplayName(NULL, NULL, |
const_cast<wchar_t *>(dir.value().c_str()), |
NULL, &dir_item, NULL); |
if (FAILED(hr)) |
return; |
- chrome::common::ScopedCoMem<ITEMIDLIST> file_item; |
+ app::win::ScopedCoMem<ITEMIDLIST> file_item; |
hr = desktop->ParseDisplayName(NULL, NULL, |
const_cast<wchar_t *>(full_path.value().c_str()), |
NULL, &file_item, NULL); |
@@ -110,7 +110,7 @@ |
} |
void OpenItem(const FilePath& full_path) { |
- ui::win::OpenItemViaShell(full_path); |
+ app::win::OpenItemViaShell(full_path); |
} |
void OpenExternal(const GURL& url) { |