diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:08:21 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:08:21 +0000 |
commit | 2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c (patch) | |
tree | 86e7ab4c054af5723245dc0bdead5c08a308a466 /webkit/glue/webdropdata_win.cc | |
parent | 6f1d18ebd4dd4315b02197c4593ad905a9049f8b (diff) | |
download | chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.zip chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.tar.gz chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.tar.bz2 |
Move clipboard from app/ to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6135006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdropdata_win.cc')
-rw-r--r-- | webkit/glue/webdropdata_win.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webdropdata_win.cc b/webkit/glue/webdropdata_win.cc index bd76090..b550eb9 100644 --- a/webkit/glue/webdropdata_win.cc +++ b/webkit/glue/webdropdata_win.cc @@ -8,26 +8,26 @@ #include <shellapi.h> #include <shlobj.h> -#include "app/clipboard/clipboard_util_win.h" #include "googleurl/src/gurl.h" +#include "ui/base/clipboard/clipboard_util_win.h" // static void WebDropData::PopulateWebDropData(IDataObject* data_object, WebDropData* drop_data) { std::wstring url_str; - if (ClipboardUtil::GetUrl(data_object, &url_str, &drop_data->url_title, - false)) { + if (ui::ClipboardUtil::GetUrl(data_object, &url_str, &drop_data->url_title, + false)) { GURL test_url(url_str); if (test_url.is_valid()) drop_data->url = test_url; } - ClipboardUtil::GetFilenames(data_object, &drop_data->filenames); - ClipboardUtil::GetPlainText(data_object, &drop_data->plain_text); + ui::ClipboardUtil::GetFilenames(data_object, &drop_data->filenames); + ui::ClipboardUtil::GetPlainText(data_object, &drop_data->plain_text); std::string base_url; - ClipboardUtil::GetHtml(data_object, &drop_data->text_html, &base_url); + ui::ClipboardUtil::GetHtml(data_object, &drop_data->text_html, &base_url); if (!base_url.empty()) { drop_data->html_base_url = GURL(base_url); } - ClipboardUtil::GetFileContents(data_object, + ui::ClipboardUtil::GetFileContents(data_object, &drop_data->file_description_filename, &drop_data->file_contents); } |