summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 16:50:03 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 16:50:03 +0000
commit4792a2655593ad5fcb436f8b88184540c570a46e (patch)
tree11d176cb8cbc9f32c79a91433193eb0c7ab018b7 /chrome/common/chrome_paths.cc
parentaa075e7d76093df41e33c6866c48080f49daedbd (diff)
downloadchromium_src-4792a2655593ad5fcb436f8b88184540c570a46e.zip
chromium_src-4792a2655593ad5fcb436f8b88184540c570a46e.tar.gz
chromium_src-4792a2655593ad5fcb436f8b88184540c570a46e.tar.bz2
Move more code to using FilePath.
Review URL: http://codereview.chromium.org/11252 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 00faa97..ead0884 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -13,6 +13,7 @@
#include "chrome/common/chrome_paths.h"
#include "base/command_line.h"
+#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -52,7 +53,7 @@ bool GetGearsPluginPathFromCommandLine(std::wstring *path) {
#endif
}
-bool PathProvider(int key, std::wstring* result) {
+bool PathProvider(int key, FilePath* result) {
// Some keys are just aliases...
switch (key) {
case chrome::DIR_APP:
@@ -261,7 +262,7 @@ bool PathProvider(int key, std::wstring* result) {
if (!exists && !file_util::PathExists(cur) && !file_util::CreateDirectory(cur))
return false;
- result->swap(cur);
+ *result = FilePath::FromWStringHack(cur);
return true;
}