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

Unified Diff: remoting/host/desktop_session_agent.h

Issue 569593002: Maintaining the proper order of initialization WeakPtrFactory in "src/remoting" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 6 years, 3 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/desktop_session_agent.h
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h
index b971b6fff73761a022ad8e8d606f212f2b383535..90a23cb1a8e94ee2b71fa462aac725621d565b2f 100644
--- a/remoting/host/desktop_session_agent.h
+++ b/remoting/host/desktop_session_agent.h
@@ -179,9 +179,6 @@ class DesktopSessionAgent
std::string client_jid_;
- // Used to disable callbacks to |this|.
- base::WeakPtrFactory<ClientSessionControl> control_factory_;
-
base::WeakPtr<Delegate> delegate_;
// The DesktopEnvironment instance used by this agent.
@@ -228,6 +225,9 @@ class DesktopSessionAgent
// before it's received.
scoped_ptr<webrtc::DesktopFrame> last_frame_;
+ // Used to disable callbacks to |this|.
+ base::WeakPtrFactory<DesktopSessionAgent> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
};

Powered by Google App Engine
This is Rietveld 408576698