diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 16:30:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-02 16:30:45 +0000 |
| commit | f9866fa868650c6e2fd13eac2df4f9493d1c457a (patch) | |
| tree | d7b82093fcba425d9bc5ba1ef57f7f96e96162af /content/renderer/webclipboard_impl.cc | |
| parent | bbc5b67b86d128f450db14b8edb9d702626c5719 (diff) | |
| download | chromium_src-f9866fa868650c6e2fd13eac2df4f9493d1c457a.zip chromium_src-f9866fa868650c6e2fd13eac2df4f9493d1c457a.tar.gz chromium_src-f9866fa868650c6e2fd13eac2df4f9493d1c457a.tar.bz2 | |
Move clipboard_utils.* from webkit/renderer to content/renderer.
compositor_bindings/ will be moved separately since it is its own beast.
cpp_* will also be moved later.
BUG=265753
TEST=None, just moving files around. :/
R=jamesr@chromium.org,avi@chromium.org,jochen@chromium.org
Review URL: https://codereview.chromium.org/25378002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/webclipboard_impl.cc')
| -rw-r--r-- | content/renderer/webclipboard_impl.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc index 9ab29d1..8222d3a 100644 --- a/content/renderer/webclipboard_impl.cc +++ b/content/renderer/webclipboard_impl.cc @@ -9,6 +9,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/drop_data.h" +#include "content/renderer/clipboard_utils.h" #include "content/renderer/drop_data_builder.h" #include "content/renderer/scoped_clipboard_writer_glue.h" #include "third_party/WebKit/public/platform/WebData.h" @@ -23,7 +24,6 @@ #include "ui/base/clipboard/custom_data_helper.h" #include "url/gurl.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/renderer/clipboard_utils.h" using WebKit::WebClipboard; using WebKit::WebData; @@ -175,13 +175,13 @@ void WebClipboardImpl::writeURL(const WebURL& url, const WebString& title) { ScopedClipboardWriterGlue scw(client_); scw.WriteBookmark(title, url.spec()); - scw.WriteHTML(UTF8ToUTF16(webkit_clipboard::URLToMarkup(url, title)), - std::string()); + scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), std::string()); scw.WriteText(UTF8ToUTF16(std::string(url.spec()))); } -void WebClipboardImpl::writeImage( - const WebImage& image, const WebURL& url, const WebString& title) { +void WebClipboardImpl::writeImage(const WebImage& image, + const WebURL& url, + const WebString& title) { ScopedClipboardWriterGlue scw(client_); if (!image.isNull()) { @@ -200,8 +200,7 @@ void WebClipboardImpl::writeImage( // 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(webkit_clipboard::URLToImageMarkup(url, title)), - std::string()); + scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), std::string()); #endif } } @@ -252,4 +251,3 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer, } } // namespace content - |