chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.cc

diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc

index 09617c6386ce22e45da8dd8d5c08703c559139e9..67aeb30ab1fe1f48cc718997977f3f81c94de6e0 100644

--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc

+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc

@@ -1205,8 +1205,8 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(

alternate_urls.AppendString(std::string(engine.alternate_urls[i]));

}

- return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),

- WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,

+ return MakePrepopulatedTemplateURL(profile, base::WideToUTF16(engine.name),

+ base::WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,

engine.instant_url, engine.favicon_url, engine.encoding, alternate_urls,

engine.search_terms_replacement_key, engine.id);

}