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

Unified Diff: remoting/host/daemon_process_win.cc

Issue 16143004: Use a weak pointer to post service control events and session change notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback Created 7 years, 6 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/daemon_process.cc ('k') | remoting/host/win/host_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process_win.cc
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index e3f2b4d410da04a8b4b5a5235c5b0a9cacdaef8b..5d2dc9464b5b21d007f618cf1b276fb5e7d93d0a 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -60,9 +60,6 @@ class DaemonProcessWin : public DaemonProcess {
IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
protected:
- // Stoppable implementation.
- virtual void DoStop() OVERRIDE;
-
// DaemonProcess implementation.
virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
int terminal_id,
@@ -89,10 +86,6 @@ DaemonProcessWin::DaemonProcessWin(
}
DaemonProcessWin::~DaemonProcessWin() {
- // Make sure that the object is completely stopped. The same check exists
- // in Stoppable::~Stoppable() but this one helps us to fail early and
- // predictably.
- CHECK_EQ(stoppable_state(), Stoppable::kStopped);
}
void DaemonProcessWin::OnChannelConnected(int32 peer_pid) {
@@ -138,13 +131,6 @@ bool DaemonProcessWin::OnDesktopSessionAgentAttached(
return true;
}
-void DaemonProcessWin::DoStop() {
- DCHECK(caller_task_runner()->BelongsToCurrentThread());
-
- network_launcher_.reset();
- DaemonProcess::DoStop();
-}
-
scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
int terminal_id,
const ScreenResolution& resolution,
« no previous file with comments | « remoting/host/daemon_process.cc ('k') | remoting/host/win/host_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698