Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "remoting/host/it2me_desktop_environment.h" | 5 #include "remoting/host/it2me_desktop_environment.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "remoting/host/client_session_control.h" | 9 #include "remoting/host/client_session_control.h" |
| 10 #include "remoting/host/host_window.h" | 10 #include "remoting/host/host_window.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 78 ui_task_runner) { | 78 ui_task_runner) { |
| 79 } | 79 } |
| 80 | 80 |
| 81 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() { | 81 It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() { |
| 82 } | 82 } |
| 83 | 83 |
| 84 scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( | 84 scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create( |
| 85 base::WeakPtr<ClientSessionControl> client_session_control) { | 85 base::WeakPtr<ClientSessionControl> client_session_control) { |
| 86 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 86 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 87 | 87 |
| 88 return make_scoped_ptr(new It2MeDesktopEnvironment(caller_task_runner(), | 88 scoped_ptr<It2MeDesktopEnvironment> desktop_environment = make_scoped_ptr( |
| 89 input_task_runner(), | 89 new It2MeDesktopEnvironment(caller_task_runner(), input_task_runner(), |
| 90 ui_task_runner(), | 90 ui_task_runner(), client_session_control)); |
| 91 client_session_control)); | 91 |
| 92 desktop_environment->SetEnableMultiTouch(multi_touch_enabled()); | |
|
Wez
2015/04/21 02:12:12
As elsewhere, didn't think we were enabling touch
Rintaro Kuroiwa
2015/04/22 19:55:59
Removed
| |
| 93 return desktop_environment.Pass(); | |
| 92 } | 94 } |
| 93 | 95 |
| 94 } // namespace remoting | 96 } // namespace remoting |
| OLD | NEW |