| Index: content/shell/shell_browser_main_parts.cc
|
| diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc
|
| index 7d76221ddc176e27621dba4d063679a75745e019..9e7108d2220a31d084b0f0286d1ca3f34762c5fa 100644
|
| --- a/content/shell/shell_browser_main_parts.cc
|
| +++ b/content/shell/shell_browser_main_parts.cc
|
| @@ -29,6 +29,10 @@
|
| #include "net/android/network_change_notifier_factory_android.h"
|
| #endif
|
|
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| +#include "ui/base/touch/touch_factory.h"
|
| +#endif
|
| +
|
| namespace content {
|
|
|
| namespace {
|
| @@ -79,6 +83,9 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {
|
|
|
| #if !defined(OS_MACOSX)
|
| void ShellBrowserMainParts::PreMainMessageLoopStart() {
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| + ui::TouchFactory::SetTouchDeviceListFromCommandLine();
|
| +#endif
|
| }
|
| #endif
|
|
|
|
|