| 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() {
|
|
|