content/shell/shell_content_browser_client.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: content/shell/shell_content_browser_client.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: content/shell/shell_content_browser_client.cc

diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc

index 163027fae217a3965ba1c61cd9ddd3db0494bec1..193d8ab85ef356b7e20ea7499c8a9e02201f2034 100644

--- a/content/shell/shell_content_browser_client.cc

+++ b/content/shell/shell_content_browser_client.cc

@@ -78,9 +78,9 @@ ShellContentBrowserClient::ShellContentBrowserClient()

if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))

return;

webkit_source_dir_ = GetWebKitRootDirFilePath();

- base::FilePath dictionary_file_path = GetChromiumRootDirFilePath().Append(

- FILE_PATH_LITERAL("third_party/hyphen/hyph_en_US.dic"));

- file_util::AbsolutePath(&dictionary_file_path);

+ base::FilePath dictionary_file_path = base::MakeAbsoluteFilePath(

+ GetChromiumRootDirFilePath().Append(

+ FILE_PATH_LITERAL("third_party/hyphen/hyph_en_US.dic")));

hyphen_dictionary_file_ = base::CreatePlatformFile(dictionary_file_path,

base::PLATFORM_FILE_READ |

base::PLATFORM_FILE_OPEN,