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

Unified Diff: base/message_loop/message_pump_x11.cc

Issue 52823002: x11: Move XInput2 availability information out of the message pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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
« no previous file with comments | « base/message_loop/message_pump_x11.h ('k') | ui/aura/root_window_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_loop/message_pump_x11.cc
diff --git a/base/message_loop/message_pump_x11.cc b/base/message_loop/message_pump_x11.cc
index dd8b965e69568b3710211e045ec834e4db86e70f..35dcc040348d983124eb87836558b6479c80ade2 100644
--- a/base/message_loop/message_pump_x11.cc
+++ b/base/message_loop/message_pump_x11.cc
@@ -53,7 +53,7 @@ GSourceFuncs XSourceFuncs = {
Display* g_xdisplay = NULL;
int g_xinput_opcode = -1;
-bool InitializeXInput2Internal() {
+bool InitializeXInput2() {
Display* display = MessagePumpX11::GetDefaultXDisplay();
if (!display)
return false;
@@ -97,11 +97,6 @@ Window FindEventTarget(const NativeEvent& xev) {
return target;
}
-bool InitializeXInput2() {
- static bool xinput2_supported = InitializeXInput2Internal();
- return xinput2_supported;
-}
-
bool InitializeXkb() {
Display* display = MessagePumpX11::GetDefaultXDisplay();
if (!display)
@@ -153,11 +148,6 @@ Display* MessagePumpX11::GetDefaultXDisplay() {
return g_xdisplay;
}
-// static
-bool MessagePumpX11::HasXInput2() {
- return InitializeXInput2();
-}
-
#if defined(TOOLKIT_GTK)
// static
MessagePumpX11* MessagePumpX11::Current() {
« no previous file with comments | « base/message_loop/message_pump_x11.h ('k') | ui/aura/root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698