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 /chrome/browser/autocomplete | |
| 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 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index e089d9b..3af297b 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -856,20 +856,20 @@ views::View* AutocompleteEditViewGtk::AddToView(views::View* parent) { int AutocompleteEditViewGtk::OnPerformDrop( const views::DropTargetEvent& event) { - std::wstring text; + string16 text; const ui::OSExchangeData& data = event.data(); if (data.HasURL()) { GURL url; - std::wstring title; + string16 title; if (data.GetURLAndTitle(&url, &title)) - text = UTF8ToWide(url.spec()); + text = UTF8ToUTF16(url.spec()); } else { - std::wstring data_string; + string16 data_string; if (data.GetString(&data_string)) text = CollapseWhitespace(data_string, true); } - if (!text.empty() && OnPerformDropImpl(WideToUTF16(text))) + if (!text.empty() && OnPerformDropImpl(text)) return CopyOrLinkDragOperation(event.source_operations()); return ui::DragDropTypes::DRAG_NONE; |