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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/client_session.h » ('j') | remoting/host/client_session.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/jni/chromoting_jni_instance.h
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index ce572fc0973772083ba53a8a034c25e05f5a54c9..40c2e248c30d12c67a2e4fae008ef4fb759f8215 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -153,7 +153,6 @@ class ChromotingJniInstance
// This group of variables is to be used on the display thread.
scoped_refptr<FrameConsumerProxy> frame_consumer_;
scoped_ptr<JniFrameConsumer> view_;
- 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
// This group of variables is to be used on the network thread.
scoped_ptr<ClientContext> client_context_;
@@ -190,6 +189,7 @@ class ChromotingJniInstance
friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
+ scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
« 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