Linux: clean up some focus issues.

- Set focus to render view after finishing find.
- Make all custom buttons unfocusable. (matches windows chrome)
- Let the GtkWindow's default keyhandler run when the child widget fails to handle the key press event. Previously I optimized this out, but it turns out to be necessary because when a tab is pressed while focus is at the boundary of a child widget (e.g. the last button in an infobar) the focus has to traverse to the next child widget (e.g. the render view), and this is handled by the GtkWindow's key handler (and not the infobar's key handler).

BUG=8604,11560
Review URL: http://codereview.chromium.org/115113

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15666 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 20 insertions, 17 deletions

diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 3a02d7f..e0ac467 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -276,7 +276,6 @@ CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
                               localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
-  GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   return button;
@@ -290,7 +289,6 @@ ToolbarStarToggleGtk* BrowserToolbarGtk::BuildStarButton(
                               localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
-  GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   return button;
@@ -391,7 +389,6 @@ CustomDrawButton* BrowserToolbarGtk::BuildBackForwardButton(
                    G_CALLBACK(OnBackForwardPressEvent), this);
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
-  GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   // Popup the menu as left-aligned relative to this widget rather than the
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 9f07858..2a46a8d 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -241,13 +241,13 @@ gboolean OnKeyPress(GtkWindow* window, GdkEventKey* event, Browser* browser) {
         GdkModifierType(event->state), browser)) {
       return TRUE;
     }
-  }
 
-  if (!gtk_window_propagate_key_event(window, event)) {
-    static_cast<BrowserWindowGtk*>(browser->window())->HandleAccelerator(
-        event->keyval, GdkModifierType(event->state));
+    return gtk_window_propagate_key_event(window, event);
+  } else {
+    bool rv = gtk_window_propagate_key_event(window, event);
+    DCHECK(rv);
+    return TRUE;
   }
-  return TRUE;
 }
 
 gboolean OnButtonPressEvent(GtkWidget* widget, GdkEventButton* event,
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc
index fd263af..ed1f0b3 100644
--- a/chrome/browser/gtk/custom_button.cc
+++ b/chrome/browser/gtk/custom_button.cc
@@ -56,6 +56,7 @@ CustomDrawButton::CustomDrawButton(
     int depressed_id)
     : button_base_(normal_id, active_id, highlight_id, depressed_id) {
   widget_.Own(gtk_button_new());
+  GTK_WIDGET_UNSET_FLAGS(widget_.get(), GTK_CAN_FOCUS);
 
   gtk_widget_set_size_request(widget_.get(),
                               gdk_pixbuf_get_width(button_base_.pixbufs(0)),
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index 5c2e571..0f5b6c7 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -235,6 +235,9 @@ bool FindBarGtk::IsFindBarVisible() {
 }
 
 void FindBarGtk::RestoreSavedFocus() {
+  // TODO(estade): We should save focus and restore its previous location if we
+  // don't find any matches in our search.
+  find_bar_controller_->tab_contents()->Focus();
 }
 
 FindBarTesting* FindBarGtk::GetFindBarTesting() {
diff --git a/chrome/browser/gtk/link_button_gtk.cc b/chrome/browser/gtk/link_button_gtk.cc
index 9c81208..73eb309 100644
--- a/chrome/browser/gtk/link_button_gtk.cc
+++ b/chrome/browser/gtk/link_button_gtk.cc
@@ -79,6 +79,7 @@ gboolean LinkButtonGtk::OnLeave(GtkWidget* widget,
   return FALSE;
 }
 
+// TODO(estade): we need some visual indication when this widget is focused.
 // static
 gboolean LinkButtonGtk::OnExpose(GtkWidget* widget,
                                  GdkEventExpose* event,
diff --git a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
index 11ebfae..0785e2a 100644
--- a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
+++ b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
@@ -14,15 +14,16 @@ ToolbarStarToggleGtk::ToolbarStarToggleGtk()
       is_starred_(false),
       unstarred_(IDR_STAR, IDR_STAR_P, IDR_STAR_H, IDR_STAR_D),
       starred_(IDR_STARRED, IDR_STARRED_P, IDR_STARRED_H, 0) {
-   gtk_widget_set_size_request(widget_.get(),
-                              gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
-                              gdk_pixbuf_get_height(unstarred_.pixbufs(0)));
-
-   gtk_widget_set_app_paintable(widget_.get(), TRUE);
-   // We effectively double-buffer by virtue of having only one image...
-   gtk_widget_set_double_buffered(widget_.get(), FALSE);
-   g_signal_connect(G_OBJECT(widget_.get()), "expose-event",
-                    G_CALLBACK(OnExpose), this);
+  gtk_widget_set_size_request(widget_.get(),
+                             gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
+                             gdk_pixbuf_get_height(unstarred_.pixbufs(0)));
+
+  gtk_widget_set_app_paintable(widget_.get(), TRUE);
+  // We effectively double-buffer by virtue of having only one image...
+  gtk_widget_set_double_buffered(widget_.get(), FALSE);
+  g_signal_connect(G_OBJECT(widget_.get()), "expose-event",
+                   G_CALLBACK(OnExpose), this);
+  GTK_WIDGET_UNSET_FLAGS(widget_.get(), GTK_CAN_FOCUS);
 }
 
 ToolbarStarToggleGtk::~ToolbarStarToggleGtk() {