summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-18 19:14:50 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-18 19:14:50 +0000
commit2a9bfb68fbf05b4ccbc83cc070ab61f7aafee904 (patch)
tree6816a5acc676e1e7f255f6483969ef7f571f28a3 /chrome/browser/autocomplete
parentbb5b6bf8599b660c5bf672127ecc3cc7d964cbe8 (diff)
downloadchromium_src-2a9bfb68fbf05b4ccbc83cc070ab61f7aafee904.zip
chromium_src-2a9bfb68fbf05b4ccbc83cc070ab61f7aafee904.tar.gz
chromium_src-2a9bfb68fbf05b4ccbc83cc070ab61f7aafee904.tar.bz2
GTK: prepend protocol to cuts/copies from the omnibox.
I messed this up with r46767 BUG=44244 TEST=cut and copy both prepend the protocol when used on the entire omnibox contents. Review URL: http://codereview.chromium.org/2081005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 5f4b1aaf..7977253 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -1226,10 +1226,13 @@ void AutocompleteEditViewGtk::HandleCopyOrCutClipboard(bool copy) {
scw.WriteHyperlink(EscapeForHTML(text16), url.spec());
// Stop propagating the signal.
- static guint signal_id = copy ?
- g_signal_lookup("copy-clipboard", GTK_TYPE_TEXT_VIEW) :
+ static guint copy_signal_id =
+ g_signal_lookup("copy-clipboard", GTK_TYPE_TEXT_VIEW);
+ static guint cut_signal_id =
g_signal_lookup("cut-clipboard", GTK_TYPE_TEXT_VIEW);
- g_signal_stop_emission(text_view_, signal_id, 0);
+ g_signal_stop_emission(text_view_,
+ copy ? copy_signal_id : cut_signal_id,
+ 0);
}
}