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

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

Issue 231733005: Delete the GTK+ port of Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remerge to ToT Created 6 years, 8 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 804ebb18cfd720cc0019996a4709551bb2b3500a..cc21ccb7454e6540b555367bb207136348a31fb8 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.h
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -9,34 +9,22 @@
#include <set>
#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 {
// 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 : public GlobalShortcutListener
-#if !defined(TOOLKIT_GTK)
- ,
- public ui::PlatformEventDispatcher
-#endif
- {
+class GlobalShortcutListenerX11 : public GlobalShortcutListener,
+ public ui::PlatformEventDispatcher {
public:
GlobalShortcutListenerX11();
virtual ~GlobalShortcutListenerX11();
-#if !defined(TOOLKIT_GTK)
// ui::PlatformEventDispatcher implementation.
virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
-#endif
private:
// GlobalShortcutListener implementation.
@@ -47,12 +35,6 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener
virtual void UnregisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE;
-#if defined(TOOLKIT_GTK)
- // Callback for XEvents of the default root window.
- CHROMEG_CALLBACK_1(GlobalShortcutListenerX11, GdkFilterReturn,
- OnXEvent, GdkXEvent*, GdkEvent*);
-#endif
-
// Invoked when a global shortcut is pressed.
void OnXKeyPressEvent(::XEvent* x_event);

Powered by Google App Engine
This is Rietveld 408576698