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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change setter to public and add license header Created 5 years, 6 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 | « remoting/host/me2me_desktop_environment.cc ('k') | remoting/host/single_window_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 943d1d8e2e2dd54e9fae0158b32cf81da4227794..3b52799358b3d5efce4bb59eebe38e322277e49d 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -52,6 +52,7 @@
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/host_main.h"
#include "remoting/host/host_status_logger.h"
+#include "remoting/host/input_injector.h"
#include "remoting/host/ipc_constants.h"
#include "remoting/host/ipc_desktop_environment.h"
#include "remoting/host/ipc_host_event_logger.h"
@@ -804,7 +805,7 @@ void HostProcess::StartOnUiThread() {
daemon_channel_.get());
desktop_session_connector_ = desktop_environment_factory;
#else // !defined(OS_WIN)
- DesktopEnvironmentFactory* desktop_environment_factory;
+ BasicDesktopEnvironmentFactory* desktop_environment_factory;
if (enable_window_capture_) {
desktop_environment_factory =
new SingleWindowDesktopEnvironmentFactory(
@@ -820,6 +821,8 @@ void HostProcess::StartOnUiThread() {
context_->ui_task_runner());
}
#endif // !defined(OS_WIN)
+ desktop_environment_factory->set_supports_touch_events(
+ InputInjector::SupportsTouchEvents());
desktop_environment_factory_.reset(desktop_environment_factory);
desktop_environment_factory_->SetEnableGnubbyAuth(enable_gnubby_auth_);
« no previous file with comments | « remoting/host/me2me_desktop_environment.cc ('k') | remoting/host/single_window_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698