| OLD | NEW |
| 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 #include "remoting/host/desktop_environment.h" | 5 #include "remoting/host/desktop_environment.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "remoting/host/capturer.h" | 9 #include "remoting/host/capturer.h" |
| 10 #include "remoting/host/chromoting_host.h" | 10 #include "remoting/host/chromoting_host.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 capturer.get()); | 45 capturer.get()); |
| 46 | 46 |
| 47 if (capturer.get() == NULL || event_executor.get() == NULL) { | 47 if (capturer.get() == NULL || event_executor.get() == NULL) { |
| 48 LOG(ERROR) << "Unable to create DesktopEnvironment"; | 48 LOG(ERROR) << "Unable to create DesktopEnvironment"; |
| 49 return scoped_ptr<DesktopEnvironment>(); | 49 return scoped_ptr<DesktopEnvironment>(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 53 event_executor.reset(new SessionEventExecutorWin( | 53 event_executor.reset(new SessionEventExecutorWin( |
| 54 context->desktop_message_loop(), | 54 context->desktop_message_loop(), |
| 55 context->io_message_loop(), | 55 context->file_message_loop()->message_loop_proxy(), |
| 56 event_executor.Pass())); | 56 event_executor.Pass())); |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 return scoped_ptr<DesktopEnvironment>( | 59 return scoped_ptr<DesktopEnvironment>( |
| 60 new DesktopEnvironment(context, | 60 new DesktopEnvironment(context, |
| 61 capturer.Pass(), | 61 capturer.Pass(), |
| 62 event_executor.Pass())); | 62 event_executor.Pass())); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // static | 65 // static |
| (...skipping 14 matching lines...) Expand all Loading... |
| 80 : host_(NULL), | 80 : host_(NULL), |
| 81 context_(context), | 81 context_(context), |
| 82 capturer_(capturer.Pass()), | 82 capturer_(capturer.Pass()), |
| 83 event_executor_(event_executor.Pass()) { | 83 event_executor_(event_executor.Pass()) { |
| 84 } | 84 } |
| 85 | 85 |
| 86 DesktopEnvironment::~DesktopEnvironment() { | 86 DesktopEnvironment::~DesktopEnvironment() { |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace remoting | 89 } // namespace remoting |
| OLD | NEW |