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

Side by Side Diff: jingle/glue/thread_wrapper.h

Issue 67673003: Move WeakPtrFactory members in jingle/ classes to the correct locations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/glue/thread_wrapper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 JINGLE_GLUE_THREAD_WRAPPER_H_ 5 #ifndef JINGLE_GLUE_THREAD_WRAPPER_H_
6 #define JINGLE_GLUE_THREAD_WRAPPER_H_ 6 #define JINGLE_GLUE_THREAD_WRAPPER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 bool send_allowed_; 110 bool send_allowed_;
111 111
112 // |lock_| must be locked when accessing |messages_|. 112 // |lock_| must be locked when accessing |messages_|.
113 base::Lock lock_; 113 base::Lock lock_;
114 int last_task_id_; 114 int last_task_id_;
115 MessagesQueue messages_; 115 MessagesQueue messages_;
116 std::list<PendingSend*> pending_send_messages_; 116 std::list<PendingSend*> pending_send_messages_;
117 base::WaitableEvent pending_send_event_; 117 base::WaitableEvent pending_send_event_;
118 118
119 base::WeakPtr<JingleThreadWrapper> weak_ptr_;
119 base::WeakPtrFactory<JingleThreadWrapper> weak_ptr_factory_; 120 base::WeakPtrFactory<JingleThreadWrapper> weak_ptr_factory_;
120 base::WeakPtr<JingleThreadWrapper> weak_ptr_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(JingleThreadWrapper); 122 DISALLOW_COPY_AND_ASSIGN(JingleThreadWrapper);
123 }; 123 };
124 124
125 } // namespace jingle_glue 125 } // namespace jingle_glue
126 126
127 #endif // JINGLE_GLUE_THREAD_WRAPPER_H_ 127 #endif // JINGLE_GLUE_THREAD_WRAPPER_H_
OLDNEW
« no previous file with comments | « jingle/glue/task_pump.cc ('k') | jingle/glue/thread_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698