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

Side by Side Diff: media/mojo/services/mojo_renderer_impl.h

Issue 616513004: Convert the remaining MOJO_OVERRIDE -> override, and get rid of MOJO_OVERRIDE. (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
« no previous file with comments | « no previous file | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/renderer.h" 10 #include "media/base/renderer.h"
(...skipping 29 matching lines...) Expand all
40 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 40 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
41 DemuxerStreamProvider* demuxer_stream_provider, 41 DemuxerStreamProvider* demuxer_stream_provider,
42 mojo::ServiceProvider* audio_renderer_provider); 42 mojo::ServiceProvider* audio_renderer_provider);
43 virtual ~MojoRendererImpl(); 43 virtual ~MojoRendererImpl();
44 44
45 // Renderer implementation. 45 // Renderer implementation.
46 virtual void Initialize(const base::Closure& init_cb, 46 virtual void Initialize(const base::Closure& init_cb,
47 const StatisticsCB& statistics_cb, 47 const StatisticsCB& statistics_cb,
48 const base::Closure& ended_cb, 48 const base::Closure& ended_cb,
49 const PipelineStatusCB& error_cb, 49 const PipelineStatusCB& error_cb,
50 const BufferingStateCB& buffering_state_cb) OVERRIDE; 50 const BufferingStateCB& buffering_state_cb) override;
51 virtual void Flush(const base::Closure& flush_cb) OVERRIDE; 51 virtual void Flush(const base::Closure& flush_cb) override;
52 virtual void StartPlayingFrom(base::TimeDelta time) OVERRIDE; 52 virtual void StartPlayingFrom(base::TimeDelta time) override;
53 virtual void SetPlaybackRate(float playback_rate) OVERRIDE; 53 virtual void SetPlaybackRate(float playback_rate) override;
54 virtual void SetVolume(float volume) OVERRIDE; 54 virtual void SetVolume(float volume) override;
55 virtual base::TimeDelta GetMediaTime() OVERRIDE; 55 virtual base::TimeDelta GetMediaTime() override;
56 virtual bool HasAudio() OVERRIDE; 56 virtual bool HasAudio() override;
57 virtual bool HasVideo() OVERRIDE; 57 virtual bool HasVideo() override;
58 virtual void SetCdm(MediaKeys* cdm) OVERRIDE; 58 virtual void SetCdm(MediaKeys* cdm) override;
59 59
60 // mojo::MediaRendererClient implementation. 60 // mojo::MediaRendererClient implementation.
61 virtual void OnTimeUpdate(int64_t time_usec, 61 virtual void OnTimeUpdate(int64_t time_usec,
62 int64_t max_time_usec) MOJO_OVERRIDE; 62 int64_t max_time_usec) override;
63 virtual void OnBufferingStateChange(mojo::BufferingState state) MOJO_OVERRIDE; 63 virtual void OnBufferingStateChange(mojo::BufferingState state) override;
64 virtual void OnEnded() MOJO_OVERRIDE; 64 virtual void OnEnded() override;
65 virtual void OnError() MOJO_OVERRIDE; 65 virtual void OnError() override;
66 66
67 private: 67 private:
68 // Called when |remote_audio_renderer_| has finished initializing. 68 // Called when |remote_audio_renderer_| has finished initializing.
69 void OnInitialized(); 69 void OnInitialized();
70 70
71 // Task runner used to execute pipeline tasks. 71 // Task runner used to execute pipeline tasks.
72 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 72 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
73 73
74 DemuxerStreamProvider* demuxer_stream_provider_; 74 DemuxerStreamProvider* demuxer_stream_provider_;
75 mojo::MediaRendererPtr remote_audio_renderer_; 75 mojo::MediaRendererPtr remote_audio_renderer_;
76 76
77 // Callbacks passed to Initialize() that we forward messages from 77 // Callbacks passed to Initialize() that we forward messages from
78 // |remote_audio_renderer_| through. 78 // |remote_audio_renderer_| through.
79 base::Closure init_cb_; 79 base::Closure init_cb_;
80 base::Closure ended_cb_; 80 base::Closure ended_cb_;
81 PipelineStatusCB error_cb_; 81 PipelineStatusCB error_cb_;
82 BufferingStateCB buffering_state_cb_; 82 BufferingStateCB buffering_state_cb_;
83 83
84 base::WeakPtrFactory<MojoRendererImpl> weak_factory_; 84 base::WeakPtrFactory<MojoRendererImpl> weak_factory_;
85 DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl); 85 DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl);
86 }; 86 };
87 87
88 } // namespace media 88 } // namespace media
89 89
90 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ 90 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698