Add Delete Support to New Autofill UI

chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "autofill_popup_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 64 matching lines @@
 
 AutofillPopupViewGtk::~AutofillPopupViewGtk() {
   g_object_unref(layout_);
   gtk_widget_destroy(window_);
 }
 
 void AutofillPopupViewGtk::ShowInternal() {
   gint origin_x, origin_y;
   gdk_window_get_origin(gtk_widget_get_window(parent_), &origin_x, &origin_y);
 
-  int popup_width = GetPopupRequiredWidth();
-
   // Move the popup to appear right below the text field it is using.
   bounds_.SetRect(
       origin_x + element_bounds().x(),
       origin_y + element_bounds().y() + element_bounds().height(),
-      popup_width,
+      GetPopupRequiredWidth(),
       row_height_ * autofill_values().size());
 
   gtk_window_move(GTK_WINDOW(window_), bounds_.x(), bounds_.y());
 
-  gtk_widget_set_size_request(
-      window_,
-      popup_width,
-      row_height_ * autofill_values().size());
+  ResizePopup();
 
   render_view_host_->AddKeyboardListener(this);
 
   gtk_widget_show(window_);
 
   GtkWidget* toplevel = gtk_widget_get_toplevel(parent_);
   CHECK(gtk_widget_is_toplevel(toplevel));
   ui::StackPopupWindow(window_, toplevel);
 }
 
 void AutofillPopupViewGtk::HideInternal() {
   render_view_host_->RemoveKeyboardListener(this);
 
   gtk_widget_hide(window_);
 }
 
 void AutofillPopupViewGtk::InvalidateRow(size_t row) {
   GdkRectangle row_rect = GetRectForRow(
       row, bounds_.width(), row_height_).ToGdkRectangle();
   GdkWindow* gdk_window = gtk_widget_get_window(window_);
   gdk_window_invalidate_rect(gdk_window, &row_rect, FALSE);
 }
 
+void AutofillPopupViewGtk::ResizePopup() {
+  gtk_widget_set_size_request(
+      window_,
+      GetPopupRequiredWidth(),
+      row_height_ * autofill_values().size());
+}
+
 gboolean AutofillPopupViewGtk::HandleButtonRelease(GtkWidget* widget,
                                                    GdkEventButton* event) {
   // We only care about the left click.
   if (event->button != 1)
     return FALSE;
 
   DCHECK_EQ(selected_line(), LineFromY(event->y));
 
   AcceptSelectedLine();
 
@@ skipping 24 matching lines @@
   pango_layout_get_size(layout_, &actual_content_width, &actual_content_height);
   actual_content_width /= PANGO_SCALE;
   actual_content_height /= PANGO_SCALE;
 
   for (size_t i = 0; i < autofill_values().size(); ++i) {
     gfx::Rect line_rect = GetRectForRow(i, window_rect.width(), row_height_);
     // Only repaint and layout damaged lines.
     if (!line_rect.Intersects(damage_rect))
       continue;
 
-    if (separator_index() == static_cast<int>(i)) {
+    if (IsSeparatorIndex(i)) {
       int line_y = i * row_height_;
 
       cairo_save(cr);
       cairo_move_to(cr, 0, line_y);
       cairo_line_to(cr, window_rect.width(), line_y);
       cairo_stroke(cr);
       cairo_restore(cr);
     }
 
     if (selected_line() == static_cast<int>(i)) {
@@ skipping 35 matching lines @@
 gboolean AutofillPopupViewGtk::HandleMotion(GtkWidget* widget,
                                             GdkEventMotion* event) {
   int line = LineFromY(event->y);
 
   SetSelectedLine(line);
 
   return TRUE;
 }
 
 bool AutofillPopupViewGtk::HandleKeyPressEvent(GdkEventKey* event) {
+  // Filter modifier to only include accelerator modifiers.
+  guint modifier = event->state & gtk_accelerator_get_default_mod_mask();
+
   switch (event->keyval) {
     case GDK_Up:
       SelectPreviousLine();
       return true;
     case GDK_Down:
       SelectNextLine();
       return true;
     case GDK_Page_Up:
       SetSelectedLine(0);
       return true;
     case GDK_Page_Down:
       SetSelectedLine(autofill_values().size() - 1);
       return true;
     case GDK_Escape:
       Hide();
       return true;
     case GDK_Delete:
     case GDK_KP_Delete:
-      return (event->state == GDK_SHIFT_MASK) && RemoveSelectedLine();
+      return (modifier == GDK_SHIFT_MASK) && RemoveSelectedLine();
     case GDK_Return:
     case GDK_KP_Enter:
       return AcceptSelectedLine();
   }
 
   return false;
 }
 
 void AutofillPopupViewGtk::SetupLayout(const gfx::Rect& window_rect,
                                        const GdkColor& text_color) {
@@ skipping 24 matching lines @@
                            kMiddlePadding +
                            font_.GetStringWidth(autofill_labels()[i]));
   }
 
   return popup_width;
 }
 
 int AutofillPopupViewGtk::LineFromY(int y) {
   return y / row_height_;
 }