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

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

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed Tracked, and put Location into location.h Created 9 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 | Annotate | Revision Log
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 #include "remoting/protocol/jingle_session.h" 5 #include "remoting/protocol/jingle_session.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h"
8 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
9 #include "base/rand_util.h" 10 #include "base/rand_util.h"
10 #include "base/stl_util.h" 11 #include "base/stl_util.h"
11 #include "crypto/hmac.h" 12 #include "crypto/hmac.h"
12 #include "crypto/rsa_private_key.h" 13 #include "crypto/rsa_private_key.h"
13 #include "net/base/net_errors.h" 14 #include "net/base/net_errors.h"
14 #include "net/socket/stream_socket.h" 15 #include "net/socket/stream_socket.h"
15 #include "remoting/base/constants.h" 16 #include "remoting/base/constants.h"
16 #include "remoting/protocol/jingle_datagram_connector.h" 17 #include "remoting/protocol/jingle_datagram_connector.h"
17 #include "remoting/protocol/jingle_session_manager.h" 18 #include "remoting/protocol/jingle_session_manager.h"
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 DCHECK_NE(state_, FAILED); 466 DCHECK_NE(state_, FAILED);
466 467
467 state_ = new_state; 468 state_ = new_state;
468 if (state_change_callback_.get()) 469 if (state_change_callback_.get())
469 state_change_callback_->Run(new_state); 470 state_change_callback_->Run(new_state);
470 } 471 }
471 } 472 }
472 473
473 } // namespace protocol 474 } // namespace protocol
474 } // namespace remoting 475 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698