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

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

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.cc
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chrome/browser/extensions/global_shortcut_listener_x11.cc
index dd3ed1de80e79a9020051caf0177d4f2fe6b594d..5a3ad1a7a6cec33d98611d1d46dbbad141412f35 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -7,15 +7,10 @@
#include "content/public/browser/browser_thread.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/platform/x11/x11_event_source.h"
#include "ui/gfx/x/x11_error_tracker.h"
#include "ui/gfx/x/x11_types.h"
-#if defined(TOOLKIT_GTK)
-#include <gdk/gdkx.h>
-#else
-#include "ui/events/platform/x11/x11_event_source.h"
-#endif
-
using content::BrowserThread;
namespace {
@@ -72,13 +67,8 @@ void GlobalShortcutListenerX11::StartListening() {
DCHECK(!is_listening_); // Don't start twice.
DCHECK(!registered_hot_keys_.empty()); // Also don't start if no hotkey is
// registered.
-#if defined(TOOLKIT_GTK)
- gdk_window_add_filter(gdk_get_default_root_window(),
- &GlobalShortcutListenerX11::OnXEventThunk,
- this);
-#else
+
ui::X11EventSource::GetInstance()->AddPlatformEventDispatcher(this);
-#endif
is_listening_ = true;
}
@@ -88,18 +78,11 @@ void GlobalShortcutListenerX11::StopListening() {
DCHECK(registered_hot_keys_.empty()); // Make sure the set is clean before
// ending.
-#if defined(TOOLKIT_GTK)
- gdk_window_remove_filter(NULL,
- &GlobalShortcutListenerX11::OnXEventThunk,
- this);
-#else
ui::X11EventSource::GetInstance()->RemovePlatformEventDispatcher(this);
-#endif
is_listening_ = false;
}
-#if !defined(TOOLKIT_GTK)
bool GlobalShortcutListenerX11::CanDispatchEvent(
const ui::PlatformEvent& event) {
return event->type == KeyPress;
@@ -112,7 +95,6 @@ uint32_t GlobalShortcutListenerX11::DispatchEvent(
return ui::POST_DISPATCH_NONE;
}
-#endif
bool GlobalShortcutListenerX11::RegisterAcceleratorImpl(
const ui::Accelerator& accelerator) {
@@ -160,17 +142,6 @@ void GlobalShortcutListenerX11::UnregisterAcceleratorImpl(
registered_hot_keys_.erase(accelerator);
}
-#if defined(TOOLKIT_GTK)
-GdkFilterReturn GlobalShortcutListenerX11::OnXEvent(GdkXEvent* gdk_x_event,
- GdkEvent* gdk_event) {
- XEvent* x_event = static_cast<XEvent*>(gdk_x_event);
- if (x_event->type == KeyPress)
- OnXKeyPressEvent(x_event);
-
- return GDK_FILTER_CONTINUE;
-}
-#endif
-
void GlobalShortcutListenerX11::OnXKeyPressEvent(::XEvent* x_event) {
DCHECK(x_event->type == KeyPress);
int modifiers = 0;

Powered by Google App Engine
This is Rietveld 408576698