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

Side by Side Diff: remoting/client/jni/chromoting_jni_instance.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: 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
« no previous file with comments | « no previous file | remoting/host/client_session.h » ('j') | remoting/host/client_session.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CLIENT_CHROMOTING_JNI_INSTANCE_H_ 5 #ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
6 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_ 6 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // Used to obtain task runner references and make calls to Java methods. 146 // Used to obtain task runner references and make calls to Java methods.
147 ChromotingJniRuntime* jni_runtime_; 147 ChromotingJniRuntime* jni_runtime_;
148 148
149 // ID of the host we are connecting to. 149 // ID of the host we are connecting to.
150 std::string host_id_; 150 std::string host_id_;
151 std::string host_jid_; 151 std::string host_jid_;
152 152
153 // This group of variables is to be used on the display thread. 153 // This group of variables is to be used on the display thread.
154 scoped_refptr<FrameConsumerProxy> frame_consumer_; 154 scoped_refptr<FrameConsumerProxy> frame_consumer_;
155 scoped_ptr<JniFrameConsumer> view_; 155 scoped_ptr<JniFrameConsumer> view_;
156 scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
Wez 2014/09/12 18:21:52 This needs to stay where it is; it's not a factory
157 156
158 // This group of variables is to be used on the network thread. 157 // This group of variables is to be used on the network thread.
159 scoped_ptr<ClientContext> client_context_; 158 scoped_ptr<ClientContext> client_context_;
160 scoped_ptr<VideoRenderer> video_renderer_; 159 scoped_ptr<VideoRenderer> video_renderer_;
161 scoped_ptr<protocol::Authenticator> authenticator_; 160 scoped_ptr<protocol::Authenticator> authenticator_;
162 scoped_ptr<ChromotingClient> client_; 161 scoped_ptr<ChromotingClient> client_;
163 XmppSignalStrategy::XmppServerConfig xmpp_config_; 162 XmppSignalStrategy::XmppServerConfig xmpp_config_;
164 scoped_ptr<XmppSignalStrategy> signaling_; // Must outlive client_ 163 scoped_ptr<XmppSignalStrategy> signaling_; // Must outlive client_
165 scoped_ptr<ClientStatusLogger> client_status_logger_; 164 scoped_ptr<ClientStatusLogger> client_status_logger_;
166 base::WeakPtr<TokenFetcherProxy> token_fetcher_proxy_; 165 base::WeakPtr<TokenFetcherProxy> token_fetcher_proxy_;
(...skipping 16 matching lines...) Expand all
183 // the Android log. Used on the network thread. 182 // the Android log. Used on the network thread.
184 bool stats_logging_enabled_; 183 bool stats_logging_enabled_;
185 184
186 // The set of capabilities supported by the client. Accessed on the network 185 // The set of capabilities supported by the client. Accessed on the network
187 // thread. Once SetCapabilities() is called, this will contain the negotiated 186 // thread. Once SetCapabilities() is called, this will contain the negotiated
188 // set of capabilities for this remoting session. 187 // set of capabilities for this remoting session.
189 std::string capabilities_; 188 std::string capabilities_;
190 189
191 friend class base::RefCountedThreadSafe<ChromotingJniInstance>; 190 friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
192 191
192 scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
193 base::WeakPtrFactory<ChromotingJniInstance> weak_factory_; 193 base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;
194 194
195 DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance); 195 DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
196 }; 196 };
197 197
198 } // namespace remoting 198 } // namespace remoting
199 199
200 #endif 200 #endif
OLDNEW
« no previous file with comments | « no previous file | remoting/host/client_session.h » ('j') | remoting/host/client_session.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698