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

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

Issue 12379084: Pass the |curtain_activated| flag to IpcDesktopEnvironmentFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
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 <string> 7 #include <string>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 936
937 log_to_server_.reset( 937 log_to_server_.reset(
938 new LogToServer(host_->AsWeakPtr(), ServerLogEntry::ME2ME, 938 new LogToServer(host_->AsWeakPtr(), ServerLogEntry::ME2ME,
939 signal_strategy_.get(), directory_bot_jid_)); 939 signal_strategy_.get(), directory_bot_jid_));
940 host_event_logger_ = 940 host_event_logger_ =
941 HostEventLogger::Create(host_->AsWeakPtr(), kApplicationName); 941 HostEventLogger::Create(host_->AsWeakPtr(), kApplicationName);
942 942
943 resizing_host_observer_.reset( 943 resizing_host_observer_.reset(
944 new ResizingHostObserver(desktop_resizer_.get(), host_->AsWeakPtr())); 944 new ResizingHostObserver(desktop_resizer_.get(), host_->AsWeakPtr()));
945 945
946 #if defined(REMOTING_RDP_SESSION)
947 // TODO(alexeypa): do not create |curtain_| in this case.
948 CurtainMode* curtain = static_cast<IpcDesktopEnvironmentFactory*>(
949 desktop_environment_factory_.get());
950 #else // !defined(REMOTING_RDP_SESSION)
951 CurtainMode* curtain = curtain_.get();
952 #endif // !defined(REMOTING_RDP_SESSION)
953
946 // Create a host observer to enable/disable curtain mode as clients connect 954 // Create a host observer to enable/disable curtain mode as clients connect
947 // and disconnect. 955 // and disconnect.
948 curtaining_host_observer_.reset(new CurtainingHostObserver( 956 curtaining_host_observer_.reset(new CurtainingHostObserver(
949 curtain_.get(), host_->AsWeakPtr())); 957 curtain, host_->AsWeakPtr()));
950 curtaining_host_observer_->SetEnableCurtaining(curtain_required_); 958 curtaining_host_observer_->SetEnableCurtaining(curtain_required_);
951 959
952 if (host_user_interface_.get()) { 960 if (host_user_interface_.get()) {
953 host_user_interface_->Start( 961 host_user_interface_->Start(
954 host_, base::Bind(&HostProcess::OnDisconnectRequested, this)); 962 host_, base::Bind(&HostProcess::OnDisconnectRequested, this));
955 } 963 }
956 964
957 host_->Start(xmpp_login_); 965 host_->Start(xmpp_login_);
958 966
959 CreateAuthenticatorFactory(); 967 CreateAuthenticatorFactory();
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 return exit_code; 1109 return exit_code;
1102 } 1110 }
1103 1111
1104 } // namespace remoting 1112 } // namespace remoting
1105 1113
1106 #if !defined(OS_WIN) 1114 #if !defined(OS_WIN)
1107 int main(int argc, char** argv) { 1115 int main(int argc, char** argv) {
1108 return remoting::HostMain(argc, argv); 1116 return remoting::HostMain(argc, argv);
1109 } 1117 }
1110 #endif // !defined(OS_WIN) 1118 #endif // !defined(OS_WIN)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698