Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2715)

Unified Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 14b7c7774c68128aff0ef9a552a2d2f714f47b2e..c32f37596cef45100ddc30c1125e20c2092f4ced 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -1190,8 +1190,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.image_url, engine.new_tab_url,
engine.search_url_post_params, engine.suggest_url_post_params,
engine.instant_url_post_params, engine.image_url_post_params,
@@ -1302,7 +1302,7 @@ SearchEngineType GetEngineType(const TemplateURL& url) {
// can't be directly inspected (e.g. due to containing {google:baseURL}) can
// be converted to GURLs we can look at.
GURL gurl(url.url_ref().ReplaceSearchTerms(TemplateURLRef::SearchTermsArgs(
- ASCIIToUTF16("x"))));
+ base::ASCIIToUTF16("x"))));
return gurl.is_valid() ? GetEngineType(gurl) : SEARCH_ENGINE_OTHER;
}

Powered by Google App Engine
This is Rietveld 408576698