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

Side by Side Diff: media/mojo/services/mojo_renderer_service.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 | « media/mojo/services/mojo_renderer_impl.h ('k') | mojo/public/cpp/system/macros.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_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 public: 31 public:
32 // |connection| is a pointer to the connection back to our embedder. The 32 // |connection| is a pointer to the connection back to our embedder. The
33 // embedder should have configured it (via ConfigureOutgoingConnection) to 33 // embedder should have configured it (via ConfigureOutgoingConnection) to
34 // allow |this| to connect to a sink that will receive decoded data ready 34 // allow |this| to connect to a sink that will receive decoded data ready
35 // for playback. 35 // for playback.
36 explicit MojoRendererService(mojo::ApplicationConnection* connection); 36 explicit MojoRendererService(mojo::ApplicationConnection* connection);
37 virtual ~MojoRendererService(); 37 virtual ~MojoRendererService();
38 38
39 // mojo::MediaRenderer implementation. 39 // mojo::MediaRenderer implementation.
40 virtual void Initialize(mojo::DemuxerStreamPtr stream, 40 virtual void Initialize(mojo::DemuxerStreamPtr stream,
41 const mojo::Callback<void()>& callback) MOJO_OVERRIDE; 41 const mojo::Callback<void()>& callback) override;
42 virtual void Flush(const mojo::Callback<void()>& callback) MOJO_OVERRIDE; 42 virtual void Flush(const mojo::Callback<void()>& callback) override;
43 virtual void StartPlayingFrom(int64_t time_delta_usec) MOJO_OVERRIDE; 43 virtual void StartPlayingFrom(int64_t time_delta_usec) override;
44 virtual void SetPlaybackRate(float playback_rate) MOJO_OVERRIDE; 44 virtual void SetPlaybackRate(float playback_rate) override;
45 virtual void SetVolume(float volume) MOJO_OVERRIDE; 45 virtual void SetVolume(float volume) override;
46 46
47 private: 47 private:
48 // Called when the MojoDemuxerStreamAdapter is ready to go (has a config, 48 // Called when the MojoDemuxerStreamAdapter is ready to go (has a config,
49 // pipe handle, etc) and can be handed off to a renderer for use. 49 // pipe handle, etc) and can be handed off to a renderer for use.
50 void OnStreamReady(); 50 void OnStreamReady();
51 51
52 // Called when |audio_renderer_| initialization has completed. 52 // Called when |audio_renderer_| initialization has completed.
53 void OnAudioRendererInitializeDone(PipelineStatus status); 53 void OnAudioRendererInitializeDone(PipelineStatus status);
54 54
55 // Callback executed by filters to update statistics. 55 // Callback executed by filters to update statistics.
(...skipping 24 matching lines...) Expand all
80 media::AudioHardwareConfig hardware_config_; 80 media::AudioHardwareConfig hardware_config_;
81 81
82 base::WeakPtrFactory<MojoRendererService> weak_factory_; 82 base::WeakPtrFactory<MojoRendererService> weak_factory_;
83 base::WeakPtr<MojoRendererService> weak_this_; 83 base::WeakPtr<MojoRendererService> weak_this_;
84 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); 84 DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
85 }; 85 };
86 86
87 } // namespace media 87 } // namespace media
88 88
89 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 89 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.h ('k') | mojo/public/cpp/system/macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698