summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc7
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.h10
2 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 20609db..566c8d2 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -458,11 +458,10 @@ void AutocompleteEditViewGtk::HandleViewMoveCursor(
g_signal_stop_emission_by_name(text_view_, "move-cursor");
}
-gboolean AutocompleteEditViewGtk::HandleViewSizeRequest(GtkRequisition* req) {
- // Don't force a minimum width, but use the font-relative height.
- GTK_WIDGET_GET_CLASS(text_view_)->size_request(text_view_, req);
+void AutocompleteEditViewGtk::HandleViewSizeRequest(GtkRequisition* req) {
+ // Don't force a minimum width, but use the font-relative height. This is a
+ // run-first handler, so the default handler was already called.
req->width = 1;
- return TRUE; // We already called the default handler.
}
AutocompleteEditViewGtk::CharRange AutocompleteEditViewGtk::GetSelection() {
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
index 33af52d..637cd87 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
@@ -160,13 +160,13 @@ class AutocompleteEditViewGtk : public AutocompleteEditView {
gint count,
gboolean extendion_selection);
- static gboolean HandleViewSizeRequestThunk(GtkWidget* view,
- GtkRequisition* req,
- gpointer self) {
- return reinterpret_cast<AutocompleteEditViewGtk*>(self)->
+ static void HandleViewSizeRequestThunk(GtkWidget* view,
+ GtkRequisition* req,
+ gpointer self) {
+ reinterpret_cast<AutocompleteEditViewGtk*>(self)->
HandleViewSizeRequest(req);
}
- gboolean HandleViewSizeRequest(GtkRequisition* req);
+ void HandleViewSizeRequest(GtkRequisition* req);
// Get the character indices of the current selection. This honors
// direction, cp_max is the insertion point, and cp_min is the bound.