reland r57885 with a fix for linux/views.

chrome/browser/gtk/constrained_window_gtk.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_GTK_CONSTRAINED_WINDOW_GTK_H_
 #define CHROME_BROWSER_GTK_CONSTRAINED_WINDOW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 
 class TabContents;
 class TabContentsViewGtk;
-typedef struct _GtkWidget GtkWidget;
 
 class ConstrainedWindowGtkDelegate {
  public:
   // Returns the widget that will be put in the constrained window's container.
   virtual GtkWidget* GetWidgetRoot() = 0;
 
   // Tells the delegate to either delete itself or set up a task to delete
   // itself later.
   virtual void DeleteDelegate() = 0;
 
@@ skipping 20 matching lines @@
 
   // Returns the View that we collaborate with to position ourselves.
   TabContentsViewGtk* ContainingView();
 
  private:
   friend class ConstrainedWindow;
 
   ConstrainedWindowGtk(TabContents* owner,
                        ConstrainedWindowGtkDelegate* delegate);
 
-  // Connects the ESC accelerator to the window.
-  void ConnectAccelerators();
-
-  // Handles an ESC accelerator being pressed.
-  CHROMEG_CALLBACK_3(ConstrainedWindowGtk, gboolean, OnEscape, GtkAccelGroup*,
-                     GObject*, guint, GdkModifierType);
+  // Handler for Escape.
+  CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, gboolean, OnKeyPress,
+                       GdkEventKey*);
 
   // The TabContents that owns and constrains this ConstrainedWindow.
   TabContents* owner_;
 
   // The top level widget container that exports to our TabContentsViewGtk.
   OwnedWidgetGtk border_;
 
   // Delegate that provides the contents of this constrained window.
   ConstrainedWindowGtkDelegate* delegate_;
 
   // Stores if |ShowConstrainedWindow()| has been called.
   bool visible_;
 
-  GtkAccelGroup* accel_group_;
-
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_CONSTRAINED_WINDOW_GTK_H_