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

Side by Side Diff: remoting/jingle_glue/jingle_thread.h

Issue 9564045: Include override the new override headers in libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_JINGLE_GLUE_JINGLE_THREAD_H_ 5 #ifndef REMOTING_JINGLE_GLUE_JINGLE_THREAD_H_
6 #define REMOTING_JINGLE_GLUE_JINGLE_THREAD_H_ 6 #define REMOTING_JINGLE_GLUE_JINGLE_THREAD_H_
7 7
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/tracked_objects.h" 9 #include "base/tracked_objects.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
11 #include "third_party/libjingle/source/talk/base/messagequeue.h" 11 #include "third_party/libjingle/overrides/talk/base/messagequeue.h"
12 #include "third_party/libjingle/overrides/talk/base/thread.h"
12 #include "third_party/libjingle/source/talk/base/taskrunner.h" 13 #include "third_party/libjingle/source/talk/base/taskrunner.h"
13 #include "third_party/libjingle/source/talk/base/thread.h"
14 14
15 namespace base { 15 namespace base {
16 class MessageLoopProxy; 16 class MessageLoopProxy;
17 } // namespace base 17 } // namespace base
18 18
19 namespace remoting { 19 namespace remoting {
20 20
21 class TaskPump : public talk_base::MessageHandler, 21 class TaskPump : public talk_base::MessageHandler,
22 public talk_base::TaskRunner { 22 public talk_base::TaskRunner {
23 public: 23 public:
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 base::WaitableEvent stopped_event_; 68 base::WaitableEvent stopped_event_;
69 MessageLoop* message_loop_; 69 MessageLoop* message_loop_;
70 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 70 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(JingleThread); 72 DISALLOW_COPY_AND_ASSIGN(JingleThread);
73 }; 73 };
74 74
75 } // namespace remoting 75 } // namespace remoting
76 76
77 #endif // REMOTING_JINGLE_GLUE_JINGLE_THREAD_H_ 77 #endif // REMOTING_JINGLE_GLUE_JINGLE_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698