summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
diff options
context:
space:
mode:
authorsuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 00:31:28 +0000
committersuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 00:31:28 +0000
commit5fdafa329b9043aa12f61f602896dc493250e4d4 (patch)
tree4cdf64377700544f83b03894dbd62818a320b38e /chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
parent2c685cc2d3dba1d3e4f0fce75483a78239f9e225 (diff)
downloadchromium_src-5fdafa329b9043aa12f61f602896dc493250e4d4.zip
chromium_src-5fdafa329b9043aa12f61f602896dc493250e4d4.tar.gz
chromium_src-5fdafa329b9043aa12f61f602896dc493250e4d4.tar.bz2
Fix control key and paste behavior in Linux omnibox.
BUG=12316: Linux Omnibox, autocomplete on paste annoying. BUG=13096: Support desired_tld in Linux omnibox BUG=20166: Linux omnibox control key behavior is incorrect TEST=Select all text in omnibox and paste something into omnibox by either ctrl-v, paste item in context menu or middle click, to see if inline autocomplete is not activated. TEST=Input something in omnibox, eg. "goog", make sure the inline autocomplete is activated, then press ctrl key to see if the inline autocomplete is still there. TEST=Input something in omnibox, eg. "cnn", press ctrl-Enter to see if www.cnn.com is opened. Review URL: http://codereview.chromium.org/173462 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_gtk.h')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
index a1c425b..ff6f3d2 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
@@ -272,6 +272,11 @@ class AutocompleteEditViewGtk : public AutocompleteEditView,
}
void HandleCopyClipboard();
+ static void HandlePasteClipboardThunk(GtkTextView* text_view, gpointer self) {
+ reinterpret_cast<AutocompleteEditViewGtk*>(self)->HandlePasteClipboard();
+ }
+ void HandlePasteClipboard();
+
// Actual implementation of SelectAll(), but also provides control over
// whether the PRIMARY selection is set to the selected text (in SelectAll(),
// it isn't, but we want set the selection when the user clicks in the entry).
@@ -390,6 +395,11 @@ class AutocompleteEditViewGtk : public AutocompleteEditView,
// during sync dispatch of "move-focus" signal.
bool tab_was_pressed_;
+ // Indicates that user requested to paste clipboard.
+ // The actual paste clipboard action might be performed later if the
+ // clipboard is not empty.
+ bool paste_clipboard_requested_;
+
// If a character is inserted, store it in this variable so that it can
// be used later in "key-press-event" signal handler to determine if a Tab or
// Enter key event is handled by IME or not.