diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
| commit | dcd5776135982012e99ea7b7030b3412f61235c7 (patch) | |
| tree | 2853a787d4c09e4a8417a0c74a312917a05dce08 /chrome/browser/platform_util_win.cc | |
| parent | 05ba8b8dd541632486513221795d45e4fe71b47f (diff) | |
| download | chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.zip chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.gz chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.bz2 | |
Reland "Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories."
The issue with the r90464 was that in the win shared build we build dlls and we
need BASE_API to export functions and symbols.
BUG=72317
TEST=None
TBR=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7263009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/platform_util_win.cc')
| -rw-r--r-- | chrome/browser/platform_util_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 24f21e1..5399458 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" @@ -18,9 +16,11 @@ #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 @@ 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); @@ -110,7 +110,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) { |