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

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

Issue 844643005: Fix few compilation errors on Windows in media/ during Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment. Created 5 years, 11 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
« media/audio/BUILD.gn ('K') | « media/mojo/services/mojo_cdm.cc ('k') | no next file » | 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/strings/utf_string_conversions.h"
7 #include "media/mojo/services/mojo_renderer_service.h" 8 #include "media/mojo/services/mojo_renderer_service.h"
8 #include "mojo/application/application_runner_chromium.h" 9 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
10 #include "mojo/public/cpp/application/application_connection.h" 11 #include "mojo/public/cpp/application/application_connection.h"
11 #include "mojo/public/cpp/application/application_delegate.h" 12 #include "mojo/public/cpp/application/application_delegate.h"
12 #include "mojo/public/cpp/application/application_impl.h" 13 #include "mojo/public/cpp/application/application_impl.h"
13 #include "mojo/public/cpp/application/interface_factory_impl.h" 14 #include "mojo/public/cpp/application/interface_factory_impl.h"
14 15
15 namespace media { 16 namespace media {
16 17
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 mojo::BindToRequest(new MojoRendererService(), &request); 51 mojo::BindToRequest(new MojoRendererService(), &request);
51 } 52 }
52 }; 53 };
53 54
54 } // namespace media 55 } // namespace media
55 56
56 MojoResult MojoMain(MojoHandle mojo_handle) { 57 MojoResult MojoMain(MojoHandle mojo_handle) {
57 mojo::ApplicationRunnerChromium runner(new media::MojoMediaApplication); 58 mojo::ApplicationRunnerChromium runner(new media::MojoMediaApplication);
58 return runner.Run(mojo_handle); 59 return runner.Run(mojo_handle);
59 } 60 }
OLDNEW
« media/audio/BUILD.gn ('K') | « media/mojo/services/mojo_cdm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698