diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 18:16:04 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 18:16:04 +0000 |
| commit | e3f9adeecf13633ff85524cecd429eab671f7506 (patch) | |
| tree | 78a721d3fe13c899c54d71f7e25d32ea3192cb20 /chrome/browser/gtk/browser_window_gtk.h | |
| parent | 6ff93a1aa55765a7adcdb5148b3f7601fc2a28d6 (diff) | |
| download | chromium_src-e3f9adeecf13633ff85524cecd429eab671f7506.zip chromium_src-e3f9adeecf13633ff85524cecd429eab671f7506.tar.gz chromium_src-e3f9adeecf13633ff85524cecd429eab671f7506.tar.bz2 | |
Hook up ctrl-w for close tab on linux.
Delay the handling of certain accelerators so we don't try to destroy a widget that GTK is reffing as a result of event handling.
Patch based on another by Dean McNamee.
Review URL: http://codereview.chromium.org/42421
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_window_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index 8811473..50a61ef 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -9,6 +9,7 @@ #include "base/gfx/rect.h" #include "base/scoped_ptr.h" +#include "base/task.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/views/widget/widget_gtk.h" @@ -114,6 +115,9 @@ class BrowserWindowGtk : public BrowserWindow, GdkModifierType modifier, BrowserWindowGtk* browser_window); + // A small shim for browser_->ExecuteCommand. + void ExecuteBrowserCommand(int id); + gfx::Rect bounds_; GdkWindowState state_; @@ -139,6 +143,10 @@ class BrowserWindowGtk : public BrowserWindow, // to move among windows as tabs are dragged around. scoped_ptr<FindBarController> find_bar_controller_; + // When it goes out of scope during our destruction, |method_factory_| will + // cancel its pending tasks (which depend on us still existing). + ScopedRunnableMethodFactory<BrowserWindowGtk> method_factory_; + // Experiment with using views for gtk. scoped_ptr<views::WidgetGtk> experimental_widget_; }; |