summaryrefslogtreecommitdiffstats
path: root/content/renderer/media
diff options
context:
space:
mode:
authorapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 09:37:00 +0000
committerapavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 09:37:00 +0000
commit1cf72e510238f135a1df7f53fafffc62e67d9090 (patch)
treeaa8c0ddc3b6f0878e20e4d6d62c6218072e6fcb8 /content/renderer/media
parenta8536bcd253940540d6f123fb32278230e78a4b9 (diff)
downloadchromium_src-1cf72e510238f135a1df7f53fafffc62e67d9090.zip
chromium_src-1cf72e510238f135a1df7f53fafffc62e67d9090.tar.gz
chromium_src-1cf72e510238f135a1df7f53fafffc62e67d9090.tar.bz2
Fix Win/Linux builds after WebKit r112784.
TBR=abarth@webkit.org Review URL: https://chromiumcodereview.appspot.com/9969041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
-rw-r--r--content/renderer/media/media_stream_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index fda0901..7d8c14a 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -22,8 +22,9 @@
#include "content/renderer/p2p/socket_dispatcher.h"
#include "jingle/glue/thread_wrapper.h"
#include "media/base/message_loop_factory.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"