diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 18:14:34 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 18:14:34 +0000 |
| commit | fc0f7aa679b48f458ecf4e207eefbceef429f063 (patch) | |
| tree | cbb9700aca67eb1281fe20a51e9b8bc3ba71f0d9 /views | |
| parent | 53920585775589db07c49b8b3a19f71c128e2582 (diff) | |
| download | chromium_src-fc0f7aa679b48f458ecf4e207eefbceef429f063.zip chromium_src-fc0f7aa679b48f458ecf4e207eefbceef429f063.tar.gz chromium_src-fc0f7aa679b48f458ecf4e207eefbceef429f063.tar.bz2 | |
De-wstringify OSExchangeData.
(Note that I didn't need to adjust many callers on the Windows
side because wstring and string16 are compatible on Windows.)
BUG=23581
Review URL: http://codereview.chromium.org/6596087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/drag_utils.cc | 2 | ||||
| -rw-r--r-- | views/widget/drop_target_gtk.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/views/drag_utils.cc b/views/drag_utils.cc index dd7c887..b315130 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -33,7 +33,7 @@ void SetURLAndDragImage(const GURL& url, OSExchangeData* data) { DCHECK(url.is_valid() && data); - data->SetURL(url, title); + data->SetURL(url, WideToUTF16(title)); // Create a button to render the drag image for us. views::TextButton button(NULL, diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc index 8f30d14..ee2abfd 100644 --- a/views/widget/drop_target_gtk.cc +++ b/views/widget/drop_target_gtk.cc @@ -104,7 +104,7 @@ void DropTargetGtk::OnDragDataReceived(GdkDragContext* context, UTF8ToUTF16(as_char, strlen(as_char), &result); g_free(text_data); } - data_provider().SetString(UTF16ToWideHack(result)); + data_provider().SetString(result); } else if (requested_custom_formats_.find(data->type) != requested_custom_formats_.end()) { Pickle result; @@ -115,12 +115,12 @@ void DropTargetGtk::OnDragDataReceived(GdkDragContext* context, GURL url; string16 title; ui::ExtractNamedURL(data, &url, &title); - data_provider().SetURL(url, UTF16ToWideHack(title)); + data_provider().SetURL(url, title); } else if (data->type == ui::GetAtomForTarget(ui::TEXT_URI_LIST)) { std::vector<GURL> urls; ui::ExtractURIList(data, &urls); if (urls.size() == 1 && urls[0].is_valid()) { - data_provider().SetURL(urls[0], std::wstring()); + data_provider().SetURL(urls[0], string16()); // TEXT_URI_LIST is used for files as well as urls. if (urls[0].SchemeIsFile()) { @@ -132,7 +132,7 @@ void DropTargetGtk::OnDragDataReceived(GdkDragContext* context, // Consumers of OSExchangeData will see this as an invalid URL. That is, // when GetURL is invoked on the OSExchangeData this triggers false to // be returned. - data_provider().SetURL(GURL(), std::wstring()); + data_provider().SetURL(GURL(), string16()); } } |