chrome/browser/shell_integration.cc - Issue 13196006: Move path functions from file_util to FilePath object.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Move AsAbsolute back out of FilePath 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:

Index: chrome/browser/shell_integration.cc

diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc

index ff0ec581cb258314dfb8036e6f4d6ba6dcc072c8..09c07e9c3b69833e92540df4727aa69b0f7f14c0 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 = 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)