summaryrefslogtreecommitdiffstats
path: root/content/renderer/webclipboard_impl.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:29:24 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:29:24 +0000
commit3295612b187d98b8e64d508fc41595dcc614e8e8 (patch)
tree00ae8d654e8c9102c6e15188a625ce57580f0e0c /content/renderer/webclipboard_impl.cc
parent0ea152b98ef30f08442d8f6c74c820f6d0db85bd (diff)
downloadchromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.zip
chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.gz
chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.bz2
Update uses of UTF conversions in content/ to use the base:: namespace.
BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/121033002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/webclipboard_impl.cc')
-rw-r--r--content/renderer/webclipboard_impl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc
index c1ee0a7..4f6e54f 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
}
}