Chromium Code Reviews| 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..5d1dc786d188b80313c1834cbdc802be6f67e060 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(OS_LINUX) && defined(USE_AURA) |
| +#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(OS_LINUX) && defined(USE_AURA) |
|
jochen (gone - plz use gerrit)
2012/09/26 18:41:57
web_contents_impl uses defined(USE_AURA) && define
sadrul
2012/09/26 19:45:54
Done.
|
| + ui::TouchFactory::SetTouchDeviceListFromCommandLine(); |
| +#endif |
| } |
| #endif |