chrome/browser/google/google_util.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/google/google_util.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/google/google_util.cc

diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc

index f3d0575c430cfce8c2db4f79b6b069d0dcc73d0b..d91ea8577fc03f33848e01e7de258d53131a43d4 100644

--- a/chrome/browser/google/google_util.cc

+++ b/chrome/browser/google/google_util.cc

@@ -120,7 +120,7 @@ bool GetBrand(std::string* brand) {

string16 brand16;

bool ret = GoogleUpdateSettings::GetBrand(&brand16);

if (ret)

- brand->assign(WideToASCII(brand16));

+ brand->assign(base::WideToASCII(brand16));

return ret;

}

@@ -128,7 +128,7 @@ bool GetReactivationBrand(std::string* brand) {

string16 brand16;

bool ret = GoogleUpdateSettings::GetReactivationBrand(&brand16);

if (ret)

- brand->assign(WideToASCII(brand16));

+ brand->assign(base::WideToASCII(brand16));

return ret;

}