summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths_win.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 01:38:59 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 01:38:59 +0000
commit541434c24710c131b697cf461fc3a21ddb74ed39 (patch)
treec9c445ea4d5e2c95a7f5dd3fc3cd04078f9b3545 /chrome/common/chrome_paths_win.cc
parent60d2744cf0fbc02b5255407a6d03abb21a264dc5 (diff)
downloadchromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.zip
chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.gz
chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.bz2
Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.
BUG=72317 TEST=None R=rsesek@chromium.org,brettw@chromium.org Review URL: http://codereview.chromium.org/7231016 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/7265009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths_win.cc')
-rw-r--r--chrome/common/chrome_paths_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc
index e8cf7e0..1892b43 100644
--- a/chrome/common/chrome_paths_win.cc
+++ b/chrome/common/chrome_paths_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,10 +10,10 @@
#include <shlobj.h>
#include <shobjidl.h>
+#include "app/win/scoped_co_mem.h"
#include "base/file_path.h"
#include "base/path_service.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/scoped_co_mem.h"
#include "chrome/installer/util/browser_distribution.h"
namespace chrome {
@@ -71,7 +71,7 @@ bool GetUserDownloadsDirectory(FilePath* result) {
REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR*);
GetKnownFolderPath f = reinterpret_cast<GetKnownFolderPath>(
GetProcAddress(GetModuleHandle(L"shell32.dll"), "SHGetKnownFolderPath"));
- chrome::common::ScopedCoMem<wchar_t> path_buf;
+ app::win::ScopedCoMem<wchar_t> path_buf;
if (f && SUCCEEDED(f(FOLDERID_Downloads, 0, NULL, &path_buf))) {
*result = FilePath(std::wstring(path_buf));
return true;