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

Side by Side Diff: remoting/host/remoting_me2me_host.cc

Issue 2458513004: Revert of Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file implements a standalone host process for Me2Me. 5 // This file implements a standalone host process for Me2Me.
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cstdint> 9 #include <cstdint>
10 #include <memory> 10 #include <memory>
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 if (enable_window_capture_) { 842 if (enable_window_capture_) {
843 desktop_environment_factory = new SingleWindowDesktopEnvironmentFactory( 843 desktop_environment_factory = new SingleWindowDesktopEnvironmentFactory(
844 context_->network_task_runner(), context_->video_capture_task_runner(), 844 context_->network_task_runner(), context_->video_capture_task_runner(),
845 context_->input_task_runner(), context_->ui_task_runner(), window_id_); 845 context_->input_task_runner(), context_->ui_task_runner(), window_id_);
846 } else { 846 } else {
847 desktop_environment_factory = new Me2MeDesktopEnvironmentFactory( 847 desktop_environment_factory = new Me2MeDesktopEnvironmentFactory(
848 context_->network_task_runner(), context_->video_capture_task_runner(), 848 context_->network_task_runner(), context_->video_capture_task_runner(),
849 context_->input_task_runner(), context_->ui_task_runner()); 849 context_->input_task_runner(), context_->ui_task_runner());
850 } 850 }
851 #endif // !defined(REMOTING_MULTI_PROCESS) 851 #endif // !defined(REMOTING_MULTI_PROCESS)
852 desktop_environment_factory->set_supports_touch_events(
853 InputInjector::SupportsTouchEvents());
852 854
853 desktop_environment_factory_.reset(desktop_environment_factory); 855 desktop_environment_factory_.reset(desktop_environment_factory);
854 856
855 context_->network_task_runner()->PostTask( 857 context_->network_task_runner()->PostTask(
856 FROM_HERE, 858 FROM_HERE,
857 base::Bind(&HostProcess::StartOnNetworkThread, this)); 859 base::Bind(&HostProcess::StartOnNetworkThread, this));
858 } 860 }
859 861
860 void HostProcess::ShutdownOnUiThread() { 862 void HostProcess::ShutdownOnUiThread() {
861 DCHECK(context_->ui_task_runner()->BelongsToCurrentThread()); 863 DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds)); 1662 base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds));
1661 new HostProcess(std::move(context), &exit_code, &shutdown_watchdog); 1663 new HostProcess(std::move(context), &exit_code, &shutdown_watchdog);
1662 1664
1663 // Run the main (also UI) message loop until the host no longer needs it. 1665 // Run the main (also UI) message loop until the host no longer needs it.
1664 base::RunLoop().Run(); 1666 base::RunLoop().Run();
1665 1667
1666 return exit_code; 1668 return exit_code;
1667 } 1669 }
1668 1670
1669 } // namespace remoting 1671 } // namespace remoting
OLDNEW
« 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