diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 16:32:12 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 16:32:12 +0000 |
| commit | da457fcdb0c41a74e4cad243d48d27343310d134 (patch) | |
| tree | 38c92095d6e0b15d32fd2bd4be42eb9e34b37c27 /remoting/host/remoting_me2me_host.cc | |
| parent | 14e8106ca5036b98170eb83c68fbc873773596a4 (diff) | |
| download | chromium_src-da457fcdb0c41a74e4cad243d48d27343310d134.zip chromium_src-da457fcdb0c41a74e4cad243d48d27343310d134.tar.gz chromium_src-da457fcdb0c41a74e4cad243d48d27343310d134.tar.bz2 | |
Use separate implementations of DesktopEnvironmentFactory for It2Me and Me2Me.
BUG=190051
Review URL: https://codereview.chromium.org/12774009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/remoting_me2me_host.cc')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 35823b3..129834b 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -34,7 +34,6 @@ #include "remoting/base/auto_thread_task_runner.h" #include "remoting/base/breakpad.h" #include "remoting/base/constants.h" -#include "remoting/host/basic_desktop_environment.h" #include "remoting/host/branding.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" @@ -59,6 +58,7 @@ #include "remoting/host/json_host_config.h" #include "remoting/host/log_to_server.h" #include "remoting/host/logging.h" +#include "remoting/host/me2me_desktop_environment.h" #include "remoting/host/network_settings.h" #include "remoting/host/policy_hack/policy_watcher.h" #include "remoting/host/service_urls.h" @@ -603,7 +603,7 @@ void HostProcess::StartOnUiThread() { #else // !defined(OS_WIN) DesktopEnvironmentFactory* desktop_environment_factory = - new BasicDesktopEnvironmentFactory(true); + new Me2MeDesktopEnvironmentFactory(); #endif // !defined(OS_WIN) desktop_environment_factory_.reset(desktop_environment_factory); |