summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 22:30:43 +0000
committersuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 22:30:43 +0000
commit4b8b6d844d019a612a02274d298e3dcffc42276b (patch)
treecdcf3ac51559ba1b094672d960ab7ae80d3afb31
parentd9f3f52a5b10463567df6f41b2d1802a0d71886f (diff)
downloadchromium_src-4b8b6d844d019a612a02274d298e3dcffc42276b.zip
chromium_src-4b8b6d844d019a612a02274d298e3dcffc42276b.tar.gz
chromium_src-4b8b6d844d019a612a02274d298e3dcffc42276b.tar.bz2
[Linux] Don't clean PRIMARY selection clipboard when deleting omnibox text.
BUG=72583 TEST=See bug report. Review URL: http://codereview.chromium.org/6788024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80235 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 0091d21..7bb87ce 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -1549,6 +1549,16 @@ void AutocompleteEditViewGtk::HandleMarkSet(GtkTextBuffer* buffer,
void AutocompleteEditViewGtk::HandleMarkSetAfter(GtkTextBuffer* buffer,
GtkTextIter* location,
GtkTextMark* mark) {
+ if (!text_buffer_ || buffer != text_buffer_)
+ return;
+
+ // We should only update primary selection when the user changes the selection
+ // range.
+ if (mark != gtk_text_buffer_get_insert(text_buffer_) &&
+ mark != gtk_text_buffer_get_selection_bound(text_buffer_)) {
+ return;
+ }
+
UpdatePrimarySelectionIfValidURL();
}