Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: extensions/shell/browser/shell_browser_main_parts.cc

Issue 2587683002: AppShell: enable touch emulation from command line (Closed)
Patch Set: Add ui dependencies explicitly Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698