| Index: remoting/host/host_user_interface.cc
|
| diff --git a/remoting/host/host_user_interface.cc b/remoting/host/host_user_interface.cc
|
| index 365b52b6a2ae1eaea330771747c1a066f17f7430..4401fb5e65b4ed59066aeaa39cdf1e9cec601a09 100644
|
| --- a/remoting/host/host_user_interface.cc
|
| +++ b/remoting/host/host_user_interface.cc
|
| @@ -16,8 +16,7 @@ HostUserInterface::HostUserInterface(ChromotingHostContext* context)
|
| : host_(NULL),
|
| context_(context),
|
| is_monitoring_local_inputs_(false),
|
| - ui_thread_proxy_(context->ui_message_loop()),
|
| - disable_disconnect_shortcut_on_mac_(false) {
|
| + ui_thread_proxy_(context->ui_message_loop()) {
|
| }
|
|
|
| HostUserInterface::~HostUserInterface() {
|
| @@ -42,10 +41,6 @@ void HostUserInterface::Start(ChromotingHost* host,
|
| host_->AddStatusObserver(this);
|
| }
|
|
|
| -void HostUserInterface::DisableDisconnectShortcutOnMac() {
|
| - disable_disconnect_shortcut_on_mac_ = true;
|
| -}
|
| -
|
| void HostUserInterface::OnClientAuthenticated(const std::string& jid) {
|
| authenticated_jid_ = jid;
|
|
|
| @@ -129,10 +124,7 @@ void HostUserInterface::MonitorLocalInputs(bool enable) {
|
|
|
| if (enable != is_monitoring_local_inputs_) {
|
| if (enable) {
|
| - local_input_monitor_->Start(host_);
|
| - if (disable_disconnect_shortcut_on_mac_) {
|
| - local_input_monitor_->DisableShortcutOnMac();
|
| - }
|
| + local_input_monitor_->Start(host_, disconnect_callback_);
|
| } else {
|
| local_input_monitor_->Stop();
|
| }
|
|
|