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

Side by Side Diff: Source/core/platform/chromium/support/WebMediaStream.cpp

Issue 19762007: core/platform: Include wtf files using "wtf/foo.h" form. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 5 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 26
27 #include "public/platform/WebMediaStream.h" 27 #include "public/platform/WebMediaStream.h"
28 28
29 #include "core/platform/UUID.h" 29 #include "core/platform/UUID.h"
30 #include "core/platform/mediastream/MediaStreamComponent.h" 30 #include "core/platform/mediastream/MediaStreamComponent.h"
31 #include "core/platform/mediastream/MediaStreamDescriptor.h" 31 #include "core/platform/mediastream/MediaStreamDescriptor.h"
32 #include "core/platform/mediastream/MediaStreamSource.h" 32 #include "core/platform/mediastream/MediaStreamSource.h"
33 #include "public/platform/WebMediaStreamSource.h" 33 #include "public/platform/WebMediaStreamSource.h"
34 #include "public/platform/WebMediaStreamTrack.h" 34 #include "public/platform/WebMediaStreamTrack.h"
35 #include "public/platform/WebString.h" 35 #include "public/platform/WebString.h"
36 #include <wtf/OwnPtr.h> 36 #include "wtf/OwnPtr.h"
37 #include <wtf/PassOwnPtr.h> 37 #include "wtf/PassOwnPtr.h"
38 #include <wtf/Vector.h> 38 #include "wtf/Vector.h"
39 39
40 using namespace WebCore; 40 using namespace WebCore;
41 41
42 namespace WebKit { 42 namespace WebKit {
43 43
44 namespace { 44 namespace {
45 45
46 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData { 46 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
47 public: 47 public:
48 ExtraDataContainer(WebMediaStream::ExtraData* extraData) : m_extraData(adopt Ptr(extraData)) { } 48 ExtraDataContainer(WebMediaStream::ExtraData* extraData) : m_extraData(adopt Ptr(extraData)) { }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 } 171 }
172 m_private = MediaStreamDescriptor::create(label, audio, video); 172 m_private = MediaStreamDescriptor::create(label, audio, video);
173 } 173 }
174 174
175 void WebMediaStream::assign(const WebMediaStream& other) 175 void WebMediaStream::assign(const WebMediaStream& other)
176 { 176 {
177 m_private = other.m_private; 177 m_private = other.m_private;
178 } 178 }
179 179
180 } // namespace WebKit 180 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/core/platform/chromium/support/WebCString.cpp ('k') | Source/core/platform/chromium/support/WebMediaStreamTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698