Index: chrome/browser/platform_util_win.cc |
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc |
index 875863d2999124246e5f0661dace1e1b09e1d05d..5ed3d8dc890d9dbbb89cbdeeb726fe22bf5f4c8f 100644 |
--- a/chrome/browser/platform_util_win.cc |
+++ b/chrome/browser/platform_util_win.cc |
@@ -9,8 +9,6 @@ |
#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" |
@@ -19,12 +17,14 @@ |
#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 "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" |
+#include "ui/base/win/shell.h" |
#include "ui/gfx/native_widget_types.h" |
namespace platform_util { |
@@ -70,14 +70,14 @@ void ShowItemInFolder(const FilePath& full_path) { |
if (FAILED(hr)) |
return; |
- app::win::ScopedCoMem<ITEMIDLIST> dir_item; |
+ chrome::common::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; |
- app::win::ScopedCoMem<ITEMIDLIST> file_item; |
+ chrome::common::ScopedCoMem<ITEMIDLIST> file_item; |
hr = desktop->ParseDisplayName(NULL, NULL, |
const_cast<wchar_t *>(full_path.value().c_str()), |
NULL, &file_item, NULL); |
@@ -114,7 +114,7 @@ void ShowItemInFolder(const FilePath& full_path) { |
} |
void OpenItem(const FilePath& full_path) { |
- app::win::OpenItemViaShell(full_path); |
+ ui::win::OpenItemViaShell(full_path); |
} |
void OpenExternal(const GURL& url) { |