diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 01:54:44 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 01:54:44 +0000 |
| commit | 5f19c7b31a1a80744f1639a2a642b879bcf9d96b (patch) | |
| tree | 1778703a87c6b960e9ea262ddd7c305521ea5027 /chrome/browser/autocomplete | |
| parent | 30811dcf747f188a196567ea209a6a3124ee5dc0 (diff) | |
| download | chromium_src-5f19c7b31a1a80744f1639a2a642b879bcf9d96b.zip chromium_src-5f19c7b31a1a80744f1639a2a642b879bcf9d96b.tar.gz chromium_src-5f19c7b31a1a80744f1639a2a642b879bcf9d96b.tar.bz2 | |
GTK: improve clipboard compatibility with firefox + evolution.
BUG=48424
TEST=copying from the chrome bookmark manager into firefox should save the bookmark's title as well as url
TEST=copying the address from the omnibox into evolution copies text, and doesn't create an attachment
Review URL: http://codereview.chromium.org/3022004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 52dbdb8..679d2f23 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -18,6 +18,7 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" +#include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/defaults.h" @@ -1213,12 +1214,10 @@ void AutocompleteEditViewGtk::HandleCopyOrCutClipboard(bool copy) { &url, &write_url); if (write_url) { - ScopedClipboardWriter scw(g_browser_process->clipboard()); string16 text16(WideToUTF16(text)); - - scw.WriteText(text16); - scw.WriteBookmark(text16, url.spec()); - scw.WriteHyperlink(EscapeForHTML(text16), url.spec()); + BookmarkDragData data; + data.ReadFromTuple(url, text16); + data.WriteToClipboard(NULL); // Stop propagating the signal. static guint copy_signal_id = |