OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <X11/keysym.h> | 5 #include <X11/keysym.h> |
6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
7 | 7 |
8 // X macro fail. | 8 // X macro fail. |
9 #if defined(RootWindow) | 9 #if defined(RootWindow) |
10 #undef RootWindow | 10 #undef RootWindow |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 | 307 |
308 // Input-only window used for events. | 308 // Input-only window used for events. |
309 ::Window x_window_; | 309 ::Window x_window_; |
310 | 310 |
311 DISALLOW_COPY_AND_ASSIGN(UIControlsDesktopX11); | 311 DISALLOW_COPY_AND_ASSIGN(UIControlsDesktopX11); |
312 }; | 312 }; |
313 | 313 |
314 } // namespace | 314 } // namespace |
315 | 315 |
316 UIControlsAura* CreateUIControlsDesktopAura() { | 316 UIControlsAura* CreateUIControlsDesktopAura() { |
| 317 // The constructor of UIControlsDesktopX11 needs XInitThreads to be called. |
| 318 XInitThreads(); |
317 return new UIControlsDesktopX11(); | 319 return new UIControlsDesktopX11(); |
318 } | 320 } |
319 | 321 |
320 } // namespace test | 322 } // namespace test |
321 } // namespace views | 323 } // namespace views |
OLD | NEW |