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

Unified Diff: content/renderer/render_view_impl.cc

Issue 121033002: Update uses of UTF conversions in content/ 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
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c6d2f910f51c7139b06266fffeba20d41d89313a..ab5adf84d3975068af5cfec77a0c2d0e45928c25 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2028,7 +2028,7 @@ void RenderViewImpl::UpdateTitle(WebFrame* frame,
return;
base::debug::TraceLog::GetInstance()->UpdateProcessLabel(
- routing_id_, UTF16ToUTF8(title));
+ routing_id_, base::UTF16ToUTF8(title));
base::string16 shortened_title = title.substr(0, kMaxTitleChars);
Send(new ViewHostMsg_UpdateTitle(routing_id_, page_id_, shortened_title,
@@ -2477,7 +2477,7 @@ void RenderViewImpl::didChangeSelection(bool is_empty_selection) {
}
void RenderViewImpl::didExecuteCommand(const WebString& command_name) {
- const std::string& name = UTF16ToUTF8(command_name);
+ const std::string& name = base::UTF16ToUTF8(command_name);
if (StartsWithASCII(name, "Move", true) ||
StartsWithASCII(name, "Insert", true) ||
StartsWithASCII(name, "Delete", true))
@@ -6028,12 +6028,12 @@ void RenderViewImpl::registerProtocolHandler(const WebString& scheme,
const WebString& title) {
bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
GURL base(base_url);
- GURL absolute_url = base.Resolve(UTF16ToUTF8(url));
+ GURL absolute_url = base.Resolve(base::UTF16ToUTF8(url));
if (base.GetOrigin() != absolute_url.GetOrigin()) {
return;
}
Send(new ViewHostMsg_RegisterProtocolHandler(routing_id_,
- UTF16ToUTF8(scheme),
+ base::UTF16ToUTF8(scheme),
absolute_url,
title,
user_gesture));
@@ -6111,7 +6111,7 @@ WebContentDetectionResult RenderViewImpl::detectContentAround(
ContentDetector::Result content = (*it)->FindTappedContent(touch_hit);
if (content.valid) {
return WebContentDetectionResult(content.content_boundaries,
- UTF8ToUTF16(content.text), content.intent_url);
+ base::UTF8ToUTF16(content.text), content.intent_url);
}
}
return WebContentDetectionResult();
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698