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

Side by Side Diff: content/renderer/media/android/renderer_demuxer_android.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_
7 7
8 #include "base/atomic_sequence_num.h" 8 #include "base/atomic_sequence_num.h"
9 #include "base/id_map.h" 9 #include "base/id_map.h"
10 #include "ipc/message_filter.h" 10 #include "ipc/message_filter.h"
(...skipping 26 matching lines...) Expand all
37 // 37 //
38 // Must be called on media thread. 38 // Must be called on media thread.
39 void AddDelegate(int demuxer_client_id, MediaSourceDelegate* delegate); 39 void AddDelegate(int demuxer_client_id, MediaSourceDelegate* delegate);
40 40
41 // Removes the association created by AddDelegate(). 41 // Removes the association created by AddDelegate().
42 // 42 //
43 // Must be called on media thread. 43 // Must be called on media thread.
44 void RemoveDelegate(int demuxer_client_id); 44 void RemoveDelegate(int demuxer_client_id);
45 45
46 // IPC::MessageFilter overrides. 46 // IPC::MessageFilter overrides.
47 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 47 virtual bool OnMessageReceived(const IPC::Message& message) override;
48 48
49 // media::DemuxerAndroidClient "implementation". 49 // media::DemuxerAndroidClient "implementation".
50 // 50 //
51 // TODO(scherkus): Consider having RendererDemuxerAndroid actually implement 51 // TODO(scherkus): Consider having RendererDemuxerAndroid actually implement
52 // media::DemuxerAndroidClient and MediaSourceDelegate actually implement 52 // media::DemuxerAndroidClient and MediaSourceDelegate actually implement
53 // media::DemuxerAndroid. 53 // media::DemuxerAndroid.
54 void DemuxerReady(int demuxer_client_id, 54 void DemuxerReady(int demuxer_client_id,
55 const media::DemuxerConfigs& configs); 55 const media::DemuxerConfigs& configs);
56 void ReadFromDemuxerAck(int demuxer_client_id, 56 void ReadFromDemuxerAck(int demuxer_client_id,
57 const media::DemuxerData& data); 57 const media::DemuxerData& data);
(...skipping 18 matching lines...) Expand all
76 IDMap<MediaSourceDelegate> delegates_; 76 IDMap<MediaSourceDelegate> delegates_;
77 scoped_refptr<ThreadSafeSender> thread_safe_sender_; 77 scoped_refptr<ThreadSafeSender> thread_safe_sender_;
78 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; 78 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(RendererDemuxerAndroid); 80 DISALLOW_COPY_AND_ASSIGN(RendererDemuxerAndroid);
81 }; 81 };
82 82
83 } // namespace content 83 } // namespace content
84 84
85 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ 85 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.h ('k') | content/renderer/media/android/renderer_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698