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

Unified Diff: remoting/host/host_user_interface.cc

Issue 10447041: Fix Ctrl+Alt+Esc keyboard shortcut in Me2Me host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/host_user_interface.h ('k') | remoting/host/local_input_monitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « remoting/host/host_user_interface.h ('k') | remoting/host/local_input_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698