Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5906)

Unified Diff: chrome/browser/platform_util_win.cc

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/importer/importer_unittest.cc ('k') | chrome/browser/tab_contents/web_drop_target_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « chrome/browser/importer/importer_unittest.cc ('k') | chrome/browser/tab_contents/web_drop_target_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698