diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 02:00:50 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 02:00:50 +0000 |
commit | be623b0f2ec23b3032fc6c8b61d6062accf51bb7 (patch) | |
tree | 2ffa24729ec7c5a0c1d9d92d200ec66fa675feef /chrome/browser/autocomplete/autocomplete_edit_view_win.cc | |
parent | 956d5aecbbf21ab3f84c87a8aec7d3a47eefbd34 (diff) | |
download | chromium_src-be623b0f2ec23b3032fc6c8b61d6062accf51bb7.zip chromium_src-be623b0f2ec23b3032fc6c8b61d6062accf51bb7.tar.gz chromium_src-be623b0f2ec23b3032fc6c8b61d6062accf51bb7.tar.bz2 |
Clipboard:
- Move link construction logic to scoped_clipboard_writer.cc
- Make callers use EscapeForHTML on the anchor text
- Make WriteHyperlink just write html, and not a bookmark as well (only affects one caller, which I updated)
- implement WriteBookmark for gtk
BUG=18034,18035
Review URL: http://codereview.chromium.org/194052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_win.cc')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 3347a34..7a09dac 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -39,6 +39,7 @@ #include "chrome/common/notification_service.h" #include "googleurl/src/url_util.h" #include "grit/generated_resources.h" +#include "net/base/escape.h" #include "skia/ext/skia_utils_win.h" #include "views/drag_utils.h" #include "views/focus/focus_util_win.h" @@ -1197,7 +1198,8 @@ void AutocompleteEditViewWin::OnCopy() { scw.WriteText(UTF8ToWide(url.spec())); else scw.WriteText(text); - scw.WriteHyperlink(text, url.spec()); + scw.WriteBookmark(text, url.spec()); + scw.WriteHyperlink(EscapeForHTML(UTF16ToUTF8(text)), url.spec()); return; } } |