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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Try fixes, merge Created 7 years, 9 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
« base/files/file_path.cc ('K') | « chrome/browser/platform_util_win.cc ('k') | chrome/browser/ui/webui/version_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index ff0ec581cb258314dfb8036e6f4d6ba6dcc072c8..f06e4cb0fe2b05f4e2bdf5e2042f1234734acd20 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -74,10 +74,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 = user_data_dir.AsAbsolute();
+ if (!user_data_dir.empty() && file_util::PathExists(user_data_dir))
new_cmd_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
- }
}
#if defined(OS_CHROMEOS)
« base/files/file_path.cc ('K') | « chrome/browser/platform_util_win.cc ('k') | chrome/browser/ui/webui/version_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698