Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3095)

Unified Diff: chrome/browser/extensions/global_shortcut_listener_x11.h

Issue 219743002: x11: Move X event handling out of the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r261267 Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/global_shortcut_listener_x11.h
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.h b/chrome/browser/extensions/global_shortcut_listener_x11.h
index 69ebca1474395c96a52967a039fd38e8641eaa7a..804ebb18cfd720cc0019996a4709551bb2b3500a 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.h
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -8,12 +8,13 @@
#include <X11/Xlib.h>
#include <set>
-#include "base/message_loop/message_pump_dispatcher.h"
#include "chrome/browser/extensions/global_shortcut_listener.h"
#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h>
#include "ui/base/gtk/gtk_signal.h"
+#else
+#include "ui/events/platform/platform_event_dispatcher.h"
#endif // defined(TOOLKIT_GTK)
namespace extensions {
@@ -21,19 +22,20 @@ namespace extensions {
// X11-specific implementation of the GlobalShortcutListener class that
// listens for global shortcuts. Handles basic keyboard intercepting and
// forwards its output to the base class for processing.
-class GlobalShortcutListenerX11
- :
+class GlobalShortcutListenerX11 : public GlobalShortcutListener
#if !defined(TOOLKIT_GTK)
- public base::MessagePumpDispatcher,
+ ,
+ public ui::PlatformEventDispatcher
#endif
- public GlobalShortcutListener {
+ {
public:
GlobalShortcutListenerX11();
virtual ~GlobalShortcutListenerX11();
#if !defined(TOOLKIT_GTK)
- // base::MessagePumpDispatcher implementation.
- virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
+ // ui::PlatformEventDispatcher implementation.
+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+ virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
#endif
private:
« no previous file with comments | « chrome/browser/bookmarks/bookmark_node_data_unittest.cc ('k') | chrome/browser/extensions/global_shortcut_listener_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698