chrome/browser/first_run/upgrade_util_win.cc - Issue 12314090: Add utf_string_conversions to base namespace.

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

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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/upgrade_util_win.cc

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

index 59754ad45cd95b4f97b1b754f1f81a740fc30680..6f01283cd125d796f8c2a95211c174d44eeb12bc 100644

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

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

@@ -210,7 +210,7 @@ bool SwapNewChromeExeIfPresent() {

std::wstring pv_value;

if (key.ReadValue(google_update::kRegVersionField,

&pv_value) == ERROR_SUCCESS) {

- Version pv_version(WideToASCII(pv_value));

+ Version pv_version(base::WideToASCII(pv_value));

if (cmd_version.IsValid() && pv_version.IsValid() &&

!cmd_version.Equals(pv_version)) {

return false;