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

Side by Side Diff: content/renderer/media/media_stream.cc

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream.h" 5 #include "content/renderer/media/media_stream.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 // static 14 // static
15 MediaStream* MediaStream::GetMediaStream( 15 MediaStream* MediaStream::GetMediaStream(
16 const blink::WebMediaStream& stream) { 16 const blink::WebMediaStream& stream) {
17 return static_cast<MediaStream*>(stream.extraData()); 17 return static_cast<MediaStream*>(stream.getExtraData());
18 } 18 }
19 19
20 MediaStream::MediaStream() { 20 MediaStream::MediaStream() {
21 } 21 }
22 22
23 MediaStream::~MediaStream() { 23 MediaStream::~MediaStream() {
24 DCHECK(observers_.empty()); 24 DCHECK(observers_.empty());
25 } 25 }
26 26
27 void MediaStream::AddObserver(MediaStreamObserver* observer) { 27 void MediaStream::AddObserver(MediaStreamObserver* observer) {
(...skipping 23 matching lines...) Expand all
51 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) { 51 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) {
52 DCHECK(thread_checker_.CalledOnValidThread()); 52 DCHECK(thread_checker_.CalledOnValidThread());
53 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin(); 53 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin();
54 it != observers_.end(); ++it) { 54 it != observers_.end(); ++it) {
55 (*it)->TrackRemoved(track); 55 (*it)->TrackRemoved(track);
56 } 56 }
57 return true; 57 return true;
58 } 58 }
59 59
60 } // namespace content 60 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/internal_document_state_data.cc ('k') | content/renderer/media/media_stream_audio_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698