content/renderer/media/peer_connection_identity_service.h - Issue 450463002: Update webrtc&libjingle 6774:6825.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/peer_connection_identity_service.h

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 6 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 | « content/renderer/media/mock_peer_connection_impl.cc ('k') | content/renderer/media/peer_connection_tracker.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_	5 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_

6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_	6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 20 matching lines...) Expand all Loading...
31	31

32 private:	32 private:

33 void OnIdentityReady(const std::string& certificate,	33 void OnIdentityReady(const std::string& certificate,

34 const std::string& private_key);	34 const std::string& private_key);

35 void OnRequestFailed(int error);	35 void OnRequestFailed(int error);

36	36

37 void ResetPendingRequest();	37 void ResetPendingRequest();

38	38

39 // The origin of the DTLS connection.	39 // The origin of the DTLS connection.

40 GURL origin_;	40 GURL origin_;

41 talk_base::scoped_refptr<webrtc::DTLSIdentityRequestObserver>	41 rtc::scoped_refptr<webrtc::DTLSIdentityRequestObserver>

42 pending_observer_;	42 pending_observer_;

43 int pending_request_id_;	43 int pending_request_id_;

44	44

45 DISALLOW_COPY_AND_ASSIGN(PeerConnectionIdentityService);	45 DISALLOW_COPY_AND_ASSIGN(PeerConnectionIdentityService);

46 };	46 };

47	47

48 } // namespace content	48 } // namespace content

49	49

50 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_	50 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_SERVICE_H_

OLD	NEW