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

Unified Diff: remoting/host/host_user_interface.cc

Issue 13212009: Made DesktopEnvironment responsible for creation of the disconnect window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More Mac fixes. 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
Index: remoting/host/host_user_interface.cc
diff --git a/remoting/host/host_user_interface.cc b/remoting/host/host_user_interface.cc
index 333e474c8a3efe9d0475dde78c2838820cb665b9..36b5235e30a755344cb900b122a417f495b4e5af 100644
--- a/remoting/host/host_user_interface.cc
+++ b/remoting/host/host_user_interface.cc
@@ -6,8 +6,6 @@
#include "base/bind.h"
#include "remoting/host/chromoting_host.h"
-#include "remoting/host/disconnect_window.h"
-#include "remoting/host/local_input_monitor.h"
namespace remoting {
@@ -26,14 +24,10 @@ HostUserInterface::HostUserInterface(
HostUserInterface::~HostUserInterface() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
-
- disconnect_window_->Hide();
}
void HostUserInterface::Init() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
-
- disconnect_window_ = DisconnectWindow::Create(&ui_strings());
}
void HostUserInterface::Start(ChromotingHost* host,
@@ -82,7 +76,6 @@ void HostUserInterface::OnShutdown() {
void HostUserInterface::OnDisconnectCallback() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
- disconnect_window_->Hide();
DisconnectSession();
}
@@ -103,20 +96,10 @@ void HostUserInterface::DisconnectSession() const {
void HostUserInterface::ProcessOnClientAuthenticated(
const std::string& username) {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
-
- if (!disconnect_window_->Show(
- base::Bind(&HostUserInterface::OnDisconnectCallback, weak_ptr_),
- username)) {
- LOG(ERROR) << "Failed to show the disconnect window.";
- DisconnectSession();
- return;
- }
}
void HostUserInterface::ProcessOnClientDisconnected() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
-
- disconnect_window_->Hide();
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698