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

Side by Side Diff: content/browser/media/android/browser_demuxer_android.cc

Issue 884103004: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/media/android/browser_demuxer_android.h" 5 #include "content/browser/media/android/browser_demuxer_android.h"
6 6
7 #include "content/common/media/media_player_messages_android.h" 7 #include "content/common/media/media_player_messages_android.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid { 11 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {
12 public: 12 public:
13 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer, 13 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer,
14 int demuxer_client_id) 14 int demuxer_client_id)
15 : demuxer_(demuxer), 15 : demuxer_(demuxer),
16 demuxer_client_id_(demuxer_client_id) {} 16 demuxer_client_id_(demuxer_client_id) {}
17 17
18 virtual ~Internal() { 18 ~Internal() override {
19 DCHECK(ClientIDExists()) << demuxer_client_id_; 19 DCHECK(ClientIDExists()) << demuxer_client_id_;
20 demuxer_->RemoveDemuxerClient(demuxer_client_id_); 20 demuxer_->RemoveDemuxerClient(demuxer_client_id_);
21 } 21 }
22 22
23 // media::DemuxerAndroid implementation. 23 // media::DemuxerAndroid implementation.
24 virtual void Initialize(media::DemuxerAndroidClient* client) override { 24 void Initialize(media::DemuxerAndroidClient* client) override {
25 DCHECK(!ClientIDExists()) << demuxer_client_id_; 25 DCHECK(!ClientIDExists()) << demuxer_client_id_;
26 demuxer_->AddDemuxerClient(demuxer_client_id_, client); 26 demuxer_->AddDemuxerClient(demuxer_client_id_, client);
27 } 27 }
28 28
29 virtual void RequestDemuxerData(media::DemuxerStream::Type type) override { 29 void RequestDemuxerData(media::DemuxerStream::Type type) override {
30 DCHECK(ClientIDExists()) << demuxer_client_id_; 30 DCHECK(ClientIDExists()) << demuxer_client_id_;
31 demuxer_->Send(new MediaPlayerMsg_ReadFromDemuxer( 31 demuxer_->Send(new MediaPlayerMsg_ReadFromDemuxer(
32 demuxer_client_id_, type)); 32 demuxer_client_id_, type));
33 } 33 }
34 34
35 virtual void RequestDemuxerSeek( 35 void RequestDemuxerSeek(const base::TimeDelta& time_to_seek,
36 const base::TimeDelta& time_to_seek, 36 bool is_browser_seek) override {
37 bool is_browser_seek) override {
38 DCHECK(ClientIDExists()) << demuxer_client_id_; 37 DCHECK(ClientIDExists()) << demuxer_client_id_;
39 demuxer_->Send(new MediaPlayerMsg_DemuxerSeekRequest( 38 demuxer_->Send(new MediaPlayerMsg_DemuxerSeekRequest(
40 demuxer_client_id_, time_to_seek, is_browser_seek)); 39 demuxer_client_id_, time_to_seek, is_browser_seek));
41 } 40 }
42 41
43 private: 42 private:
44 // Helper for DCHECKing that the ID is still registered. 43 // Helper for DCHECKing that the ID is still registered.
45 bool ClientIDExists() { 44 bool ClientIDExists() {
46 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_); 45 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_);
47 } 46 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 133
135 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id, 134 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id,
136 const base::TimeDelta& duration) { 135 const base::TimeDelta& duration) {
137 media::DemuxerAndroidClient* client = 136 media::DemuxerAndroidClient* client =
138 demuxer_clients_.Lookup(demuxer_client_id); 137 demuxer_clients_.Lookup(demuxer_client_id);
139 if (client) 138 if (client)
140 client->OnDemuxerDurationChanged(duration); 139 client->OnDemuxerDurationChanged(duration);
141 } 140 }
142 141
143 } // namespace content 142 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_demuxer_android.h ('k') | content/browser/media/android/browser_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698