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

Unified Diff: cloud_print/service/win/chrome_launcher.cc

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try Created 7 years, 8 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
Index: cloud_print/service/win/chrome_launcher.cc
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 1d5395a677a44f4123fe6a2a79cff4a88528fd86..831af6f25d9c087a2cfa1e12fb0d7ca2006020f1 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -121,8 +121,7 @@ void DeleteAutorunKeys(const base::FilePath& user_data_dir) {
return;
std::vector<string16> to_delete;
- base::FilePath abs_user_data_dir = user_data_dir;
- file_util::AbsolutePath(&abs_user_data_dir);
+ base::FilePath abs_user_data_dir = base::MakeAbsoluteFilePath(user_data_dir);
{
base::win::RegistryValueIterator value(HKEY_CURRENT_USER, kAutoRunKeyPath);
@@ -132,9 +131,8 @@ void DeleteAutorunKeys(const base::FilePath& user_data_dir) {
if (cmd.GetSwitchValueASCII(switches::kProcessType) ==
switches::kServiceProcess &&
cmd.HasSwitch(switches::kUserDataDir)) {
- base::FilePath path_from_reg =
- cmd.GetSwitchValuePath(switches::kUserDataDir);
- file_util::AbsolutePath(&path_from_reg);
+ base::FilePath path_from_reg = base::MakeAbsoluteFilePath(
+ cmd.GetSwitchValuePath(switches::kUserDataDir));
if (path_from_reg == abs_user_data_dir) {
to_delete.push_back(value.Name());
}

Powered by Google App Engine
This is Rietveld 408576698