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

Unified Diff: chrome/browser/shell_integration.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: chrome/browser/shell_integration.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index e5e9d6e81677e98ef728354dbc43f5cd00401dc2..b16a86a9f3d8379dfe70e65c7551970a16dffb46 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -78,10 +78,9 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
#endif
if (!user_data_dir.empty()) {
// Make sure user_data_dir is an absolute path.
- if (file_util::AbsolutePath(&user_data_dir) &&
- file_util::PathExists(user_data_dir)) {
+ user_data_dir = base::MakeAbsoluteFilePath(user_data_dir);
+ if (!user_data_dir.empty() && file_util::PathExists(user_data_dir))
new_cmd_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
- }
}
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698