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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_HOST_DESKTOP_SESSION_AGENT_H_ 5 #ifndef REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
6 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_ 6 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 scoped_refptr<AutoThreadTaskRunner> io_task_runner_; 172 scoped_refptr<AutoThreadTaskRunner> io_task_runner_;
173 173
174 // Task runner dedicated to running methods of |video_capturer_|. 174 // Task runner dedicated to running methods of |video_capturer_|.
175 scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner_; 175 scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner_;
176 176
177 // Captures audio output. 177 // Captures audio output.
178 scoped_ptr<AudioCapturer> audio_capturer_; 178 scoped_ptr<AudioCapturer> audio_capturer_;
179 179
180 std::string client_jid_; 180 std::string client_jid_;
181 181
182 // Used to disable callbacks to |this|.
183 base::WeakPtrFactory<ClientSessionControl> control_factory_;
184
185 base::WeakPtr<Delegate> delegate_; 182 base::WeakPtr<Delegate> delegate_;
186 183
187 // The DesktopEnvironment instance used by this agent. 184 // The DesktopEnvironment instance used by this agent.
188 scoped_ptr<DesktopEnvironment> desktop_environment_; 185 scoped_ptr<DesktopEnvironment> desktop_environment_;
189 186
190 // Executes keyboard, mouse and clipboard events. 187 // Executes keyboard, mouse and clipboard events.
191 scoped_ptr<InputInjector> input_injector_; 188 scoped_ptr<InputInjector> input_injector_;
192 189
193 // Tracker used to release pressed keys and buttons when disconnecting. 190 // Tracker used to release pressed keys and buttons when disconnecting.
194 scoped_ptr<protocol::InputEventTracker> input_tracker_; 191 scoped_ptr<protocol::InputEventTracker> input_tracker_;
(...skipping 26 matching lines...) Expand all
221 // Captures the screen. 218 // Captures the screen.
222 scoped_ptr<webrtc::DesktopCapturer> video_capturer_; 219 scoped_ptr<webrtc::DesktopCapturer> video_capturer_;
223 220
224 // Captures mouse shapes. 221 // Captures mouse shapes.
225 scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_; 222 scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_;
226 223
227 // Keep reference to the last frame sent to make sure shared buffer is alive 224 // Keep reference to the last frame sent to make sure shared buffer is alive
228 // before it's received. 225 // before it's received.
229 scoped_ptr<webrtc::DesktopFrame> last_frame_; 226 scoped_ptr<webrtc::DesktopFrame> last_frame_;
230 227
228 // Used to disable callbacks to |this|.
229 base::WeakPtrFactory<DesktopSessionAgent> weak_factory_;
230
231 DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent); 231 DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
232 }; 232 };
233 233
234 } // namespace remoting 234 } // namespace remoting
235 235
236 #endif // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_ 236 #endif // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698