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

Side by Side Diff: Source/modules/mediastream/WebMediaStreamTrackSourcesRequest.cpp

Issue 61773005: Rename WebKit namespace to blink (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
« no previous file with comments | « Source/modules/mediastream/SourceInfo.cpp ('k') | Source/modules/quota/StorageQuota.cpp » ('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 * 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 #include "config.h" 26 #include "config.h"
27 27
28 #include "public/platform/WebMediaStreamTrackSourcesRequest.h" 28 #include "public/platform/WebMediaStreamTrackSourcesRequest.h"
29 29
30 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h" 30 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h"
31 #include "public/platform/WebSourceInfo.h" 31 #include "public/platform/WebSourceInfo.h"
32 #include "wtf/PassOwnPtr.h" 32 #include "wtf/PassOwnPtr.h"
33 33
34 using namespace WebCore; 34 using namespace WebCore;
35 35
36 namespace WebKit { 36 namespace blink {
37 37
38 namespace { 38 namespace {
39 39
40 class ExtraDataContainer : public MediaStreamTrackSourcesRequest::ExtraData { 40 class ExtraDataContainer : public MediaStreamTrackSourcesRequest::ExtraData {
41 public: 41 public:
42 ExtraDataContainer(WebMediaStreamTrackSourcesRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { } 42 ExtraDataContainer(WebMediaStreamTrackSourcesRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
43 43
44 WebMediaStreamTrackSourcesRequest::ExtraData* extraData() { return m_extraDa ta.get(); } 44 WebMediaStreamTrackSourcesRequest::ExtraData* extraData() { return m_extraDa ta.get(); }
45 45
46 private: 46 private:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 if (!data) 82 if (!data)
83 return 0; 83 return 0;
84 return static_cast<ExtraDataContainer*>(data.get())->extraData(); 84 return static_cast<ExtraDataContainer*>(data.get())->extraData();
85 } 85 }
86 86
87 void WebMediaStreamTrackSourcesRequest::setExtraData(ExtraData* extraData) 87 void WebMediaStreamTrackSourcesRequest::setExtraData(ExtraData* extraData)
88 { 88 {
89 m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData))); 89 m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData)));
90 } 90 }
91 91
92 } // namespace WebKit 92 } // namespace blink
93 93
OLDNEW
« no previous file with comments | « Source/modules/mediastream/SourceInfo.cpp ('k') | Source/modules/quota/StorageQuota.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698