| Index: extensions/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
|
| index cbee37c401ccaeb1b23d2489d98714765de3033f..58bdcf5e61d9ede31b28e4be6d151126b4031727 100644
|
| --- a/extensions/shell/browser/shell_browser_main_parts.cc
|
| +++ b/extensions/shell/browser/shell_browser_main_parts.cc
|
| @@ -67,6 +67,10 @@
|
| #include "extensions/shell/browser/shell_nacl_browser_delegate.h"
|
| #endif
|
|
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| +#include "ui/events/devices/x11/touch_factory_x11.h"
|
| +#endif
|
| +
|
| using base::CommandLine;
|
| using content::BrowserContext;
|
|
|
| @@ -89,7 +93,9 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {
|
| }
|
|
|
| void ShellBrowserMainParts::PreMainMessageLoopStart() {
|
| - // TODO(jamescook): Initialize touch here?
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| + ui::TouchFactory::SetTouchDeviceListFromCommandLine();
|
| +#endif
|
| #if defined(OS_MACOSX)
|
| MainPartsPreMainMessageLoopStartMac();
|
| #endif
|
|
|