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

Side by Side Diff: Source/web/WebMediaStreamRegistry.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "WebMediaStreamRegistry.h" 33 #include "WebMediaStreamRegistry.h"
34 34
35 #include "core/platform/mediastream/MediaStreamDescriptor.h" 35 #include "core/platform/mediastream/MediaStreamDescriptor.h"
36 #include "modules/mediastream/MediaStreamRegistry.h" 36 #include "modules/mediastream/MediaStreamRegistry.h"
37 #include "public/platform/WebMediaStream.h" 37 #include "public/platform/WebMediaStream.h"
38 #include "public/platform/WebString.h" 38 #include "public/platform/WebString.h"
39 #include "public/platform/WebURL.h" 39 #include "public/platform/WebURL.h"
40 #include "weborigin/KURL.h" 40 #include "platform/weborigin/KURL.h"
41 41
42 using namespace WebCore; 42 using namespace WebCore;
43 43
44 namespace WebKit { 44 namespace WebKit {
45 45
46 WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url) 46 WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url)
47 { 47 {
48 return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescr iptor(KURL(url).string())); 48 return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescr iptor(KURL(url).string()));
49 } 49 }
50 50
51 } // namespace WebKit 51 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698