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

Side by Side Diff: remoting/protocol/jingle_session.h

Issue 10825017: Fix invalid header guards in jingle_session(_manager)?.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | remoting/protocol/jingle_session_manager.h » ('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 REMOTING_PROTOCOL_PEPPER_SESSION_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
6 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/timer.h" 13 #include "base/timer.h"
14 #include "crypto/rsa_private_key.h" 14 #include "crypto/rsa_private_key.h"
15 #include "net/base/completion_callback.h" 15 #include "net/base/completion_callback.h"
16 #include "remoting/jingle_glue/iq_sender.h" 16 #include "remoting/jingle_glue/iq_sender.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 base::OneShotTimer<JingleSession> transport_infos_timer_; 146 base::OneShotTimer<JingleSession> transport_infos_timer_;
147 std::list<JingleMessage::NamedCandidate> pending_candidates_; 147 std::list<JingleMessage::NamedCandidate> pending_candidates_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(JingleSession); 149 DISALLOW_COPY_AND_ASSIGN(JingleSession);
150 }; 150 };
151 151
152 } // namespace protocol 152 } // namespace protocol
153 } // namespace remoting 153 } // namespace remoting
154 154
155 #endif // REMOTING_PROTOCOL_PEPPER_SESSION_H_ 155 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698