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

Side by Side Diff: webrtc/media/base/screencastid.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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
« no previous file with comments | « webrtc/media/base/rtputils_unittest.cc ('k') | webrtc/media/base/streamparams.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 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 11 matching lines...) Expand all
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 // Author: thorcarpenter@google.com (Thor Carpenter) 28 // Author: thorcarpenter@google.com (Thor Carpenter)
29 // 29 //
30 // Defines variant class ScreencastId that combines WindowId and DesktopId. 30 // Defines variant class ScreencastId that combines WindowId and DesktopId.
31 31
32 #ifndef TALK_MEDIA_BASE_SCREENCASTID_H_ 32 #ifndef WEBRTC_MEDIA_BASE_SCREENCASTID_H_
33 #define TALK_MEDIA_BASE_SCREENCASTID_H_ 33 #define WEBRTC_MEDIA_BASE_SCREENCASTID_H_
34 34
35 #include <string> 35 #include <string>
36 #include <vector> 36 #include <vector>
37 37
38 #include "webrtc/base/window.h" 38 #include "webrtc/base/window.h"
39 #include "webrtc/base/windowpicker.h" 39 #include "webrtc/base/windowpicker.h"
40 40
41 namespace cricket { 41 namespace cricket {
42 42
43 class ScreencastId; 43 class ScreencastId;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 private: 105 private:
106 Type type_; 106 Type type_;
107 rtc::WindowId window_; 107 rtc::WindowId window_;
108 rtc::DesktopId desktop_; 108 rtc::DesktopId desktop_;
109 std::string title_; // Optional. 109 std::string title_; // Optional.
110 }; 110 };
111 111
112 } // namespace cricket 112 } // namespace cricket
113 113
114 #endif // TALK_MEDIA_BASE_SCREENCASTID_H_ 114 #endif // WEBRTC_MEDIA_BASE_SCREENCASTID_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/rtputils_unittest.cc ('k') | webrtc/media/base/streamparams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698