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

Unified Diff: remoting/host/host_user_interface.cc

Issue 12594009: Converted LocalInputMonitor into a SessionController instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/host_user_interface.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('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 c411eb22934a09f0354701271deaf38af260f963..333e474c8a3efe9d0475dde78c2838820cb665b9 100644
--- a/remoting/host/host_user_interface.cc
+++ b/remoting/host/host_user_interface.cc
@@ -18,7 +18,6 @@ HostUserInterface::HostUserInterface(
: host_(NULL),
network_task_runner_(network_task_runner),
ui_task_runner_(ui_task_runner),
- is_monitoring_local_inputs_(false),
ui_strings_(ui_strings),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
weak_ptr_(weak_factory_.GetWeakPtr()) {
@@ -28,7 +27,6 @@ HostUserInterface::HostUserInterface(
HostUserInterface::~HostUserInterface() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
- MonitorLocalInputs(false);
disconnect_window_->Hide();
}
@@ -36,9 +34,6 @@ void HostUserInterface::Init() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
disconnect_window_ = DisconnectWindow::Create(&ui_strings());
- local_input_monitor_ = LocalInputMonitor::Create(ui_task_runner_,
- network_task_runner_,
- ui_task_runner_);
}
void HostUserInterface::Start(ChromotingHost* host,
@@ -87,7 +82,6 @@ void HostUserInterface::OnShutdown() {
void HostUserInterface::OnDisconnectCallback() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
- MonitorLocalInputs(false);
disconnect_window_->Hide();
DisconnectSession();
}
@@ -117,28 +111,12 @@ void HostUserInterface::ProcessOnClientAuthenticated(
DisconnectSession();
return;
}
-
- MonitorLocalInputs(true);
}
void HostUserInterface::ProcessOnClientDisconnected() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
- MonitorLocalInputs(false);
disconnect_window_->Hide();
}
-void HostUserInterface::MonitorLocalInputs(bool enable) {
- DCHECK(ui_task_runner_->BelongsToCurrentThread());
-
- if (enable != is_monitoring_local_inputs_) {
- if (enable) {
- local_input_monitor_->Start(host_, disconnect_callback_);
- } else {
- local_input_monitor_->Stop();
- }
- is_monitoring_local_inputs_ = enable;
- }
-}
-
} // namespace remoting
« no previous file with comments | « remoting/host/host_user_interface.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698