webrtc/api/mediastream.h - Issue 1610243002: Move talk/app/webrtc to webrtc/api

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

Unified Diff: webrtc/api/mediastream.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Removed processing of api.gyp for Chromium builds 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:

Index: webrtc/api/mediastream.h

diff --git a/talk/app/webrtc/mediastream.h b/webrtc/api/mediastream.h

similarity index 93%

rename from talk/app/webrtc/mediastream.h

rename to webrtc/api/mediastream.h

index 240512d9c9ce9cabdecb955c8bc2abaaca6e8bd9..94f21eb7b94b08533e045db166573844c616c8f1 100644

--- a/talk/app/webrtc/mediastream.h

+++ b/webrtc/api/mediastream.h

@@ -27,14 +27,14 @@

// This file contains the implementation of MediaStreamInterface interface.

-#ifndef TALK_APP_WEBRTC_MEDIASTREAM_H_

-#define TALK_APP_WEBRTC_MEDIASTREAM_H_

+#ifndef WEBRTC_API_MEDIASTREAM_H_

+#define WEBRTC_API_MEDIASTREAM_H_

#include <string>

#include <vector>

-#include "talk/app/webrtc/mediastreaminterface.h"

-#include "talk/app/webrtc/notifier.h"

+#include "webrtc/api/mediastreaminterface.h"

+#include "webrtc/api/notifier.h"

namespace webrtc {

@@ -72,4 +72,4 @@ class MediaStream : public Notifier<MediaStreamInterface> {

} // namespace webrtc

-#endif // TALK_APP_WEBRTC_MEDIASTREAM_H_

+#endif // WEBRTC_API_MEDIASTREAM_H_

« no previous file with comments | « webrtc/api/mediacontroller.cc ('k') | webrtc/api/mediastream.cc » ('j') | no next file with comments »