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

Unified Diff: content/renderer/webclipboard_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/web_preferences.cc ('k') | content/shell/app/shell_breakpad_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webclipboard_impl.cc
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc
index c1ee0a7123072cbfb259cfa01b160f97197aef6e..4f6e54fc06d68426c5f4c63ca9e00d6d03636501 100644
--- a/content/renderer/webclipboard_impl.cc
+++ b/content/renderer/webclipboard_impl.cc
@@ -107,7 +107,7 @@ WebString WebClipboardImpl::readPlainText(Buffer buffer) {
std::string text;
client_->ReadAsciiText(clipboard_type, &text);
if (!text.empty())
- return ASCIIToUTF16(text);
+ return base::ASCIIToUTF16(text);
}
return WebString();
@@ -187,7 +187,8 @@ void WebClipboardImpl::writeImage(const WebImage& image,
// We also don't want to write HTML on a Mac, since Mail.app prefers to use
// the image markup over attaching the actual image. See
// http://crbug.com/33016 for details.
- scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), std::string());
+ scw.WriteHTML(base::UTF8ToUTF16(URLToImageMarkup(url, title)),
+ std::string());
#endif
}
}
« no previous file with comments | « content/renderer/web_preferences.cc ('k') | content/shell/app/shell_breakpad_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698