mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4058 from kyku/master

Browse source 
Pass --touch-devices to chromium contents under X11
This commit is contained in:
Cheng Zhao 2016-01-11 22:57:00 +08:00
commit c7a89b6e29
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/atom_browser_main_parts.cc
View file

@ -21,6 +21,7 @@
#if defined(USE_X11) #if defined(USE_X11)
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h" #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
#include "ui/events/devices/x11/touch_factory_x11.h"
#endif #endif
namespace atom { namespace atom {
@ -116,6 +117,10 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
node_bindings_->PrepareMessageLoop(); node_bindings_->PrepareMessageLoop();
node_bindings_->RunMessageLoop(); node_bindings_->RunMessageLoop();
#if defined(USE_X11)
ui::TouchFactory::SetTouchDeviceListFromCommandLine();
#endif
// Start idle gc. // Start idle gc.
gc_timer_.Start( gc_timer_.Start(
FROM_HERE, base::TimeDelta::FromMinutes(1), FROM_HERE, base::TimeDelta::FromMinutes(1),