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

Side by Side Diff: media/mojo/services/mojo_renderer_service.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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 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 "media/mojo/services/mojo_renderer_service.h" 5 #include "media/mojo/services/mojo_renderer_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "media/audio/null_audio_sink.h" 9 #include "media/audio/null_audio_sink.h"
10 #include "media/base/audio_decoder.h" 10 #include "media/base/audio_decoder.h"
(...skipping 10 matching lines...) Expand all
21 #include "mojo/public/cpp/application/interface_factory_impl.h" 21 #include "mojo/public/cpp/application/interface_factory_impl.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 class MojoRendererApplication 25 class MojoRendererApplication
26 : public mojo::ApplicationDelegate, 26 : public mojo::ApplicationDelegate,
27 public mojo::InterfaceFactory<mojo::MediaRenderer> { 27 public mojo::InterfaceFactory<mojo::MediaRenderer> {
28 public: 28 public:
29 // mojo::ApplicationDelegate implementation. 29 // mojo::ApplicationDelegate implementation.
30 virtual bool ConfigureIncomingConnection( 30 virtual bool ConfigureIncomingConnection(
31 mojo::ApplicationConnection* connection) OVERRIDE { 31 mojo::ApplicationConnection* connection) override {
32 connection->AddService(this); 32 connection->AddService(this);
33 return true; 33 return true;
34 } 34 }
35 35
36 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. 36 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation.
37 virtual void Create( 37 virtual void Create(
38 mojo::ApplicationConnection* connection, 38 mojo::ApplicationConnection* connection,
39 mojo::InterfaceRequest<mojo::MediaRenderer> request) OVERRIDE { 39 mojo::InterfaceRequest<mojo::MediaRenderer> request) override {
40 mojo::BindToRequest(new MojoRendererService(connection), &request); 40 mojo::BindToRequest(new MojoRendererService(connection), &request);
41 } 41 }
42 }; 42 };
43 43
44 MojoRendererService::MojoRendererService( 44 MojoRendererService::MojoRendererService(
45 mojo::ApplicationConnection* connection) 45 mojo::ApplicationConnection* connection)
46 : hardware_config_(AudioParameters(), AudioParameters()), 46 : hardware_config_(AudioParameters(), AudioParameters()),
47 weak_factory_(this), 47 weak_factory_(this),
48 weak_this_(weak_factory_.GetWeakPtr()) { 48 weak_this_(weak_factory_.GetWeakPtr()) {
49 scoped_refptr<base::SingleThreadTaskRunner> runner( 49 scoped_refptr<base::SingleThreadTaskRunner> runner(
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void MojoRendererService::OnError(PipelineStatus error) { 132 void MojoRendererService::OnError(PipelineStatus error) {
133 client()->OnError(); 133 client()->OnError();
134 } 134 }
135 135
136 } // namespace media 136 } // namespace media
137 137
138 MojoResult MojoMain(MojoHandle shell_handle) { 138 MojoResult MojoMain(MojoHandle shell_handle) {
139 mojo::ApplicationRunnerChromium runner(new media::MojoRendererApplication); 139 mojo::ApplicationRunnerChromium runner(new media::MojoRendererApplication);
140 return runner.Run(shell_handle); 140 return runner.Run(shell_handle);
141 } 141 }
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_demuxer_stream_impl.h ('k') | media/mojo/services/renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698