chrome/browser/first_run/first_run.cc - Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

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/first_run/first_run.cc

Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 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/first_run/first_run.cc

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

index 5b7033e685bc571b810ed42a0cbe560739079683..ada11164c0538322455cebd0547d5d475172a6f8 100644

--- a/chrome/browser/first_run/first_run.cc

+++ b/chrome/browser/first_run/first_run.cc

@@ -126,7 +126,7 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,

if (WriteEULAtoTempFile(&inner_html)) {

int retcode = 0;

if (!LaunchSetupWithParam(installer::switches::kShowEula,

- inner_html.ToWStringHack(), &retcode) ||

+ inner_html.value(), &retcode) ||

(retcode == installer::EULA_REJECTED)) {

LOG(WARNING) << "EULA rejected. Fast exit.";

::ExitProcess(1);