OLD | NEW |
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 "chromecast/browser/cast_content_browser_client.h" | 5 #include "chromecast/browser/cast_content_browser_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 76 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
77 static std::unique_ptr<::shell::Service> CreateMojoMediaApplication( | 77 static std::unique_ptr<::shell::Service> CreateMojoMediaApplication( |
78 CastContentBrowserClient* browser_client, | 78 CastContentBrowserClient* browser_client, |
79 const base::Closure& quit_closure) { | 79 const base::Closure& quit_closure) { |
80 std::unique_ptr<media::CastMojoMediaClient> mojo_media_client( | 80 std::unique_ptr<media::CastMojoMediaClient> mojo_media_client( |
81 new media::CastMojoMediaClient( | 81 new media::CastMojoMediaClient( |
82 base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, | 82 base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, |
83 base::Unretained(browser_client)), | 83 base::Unretained(browser_client)), |
84 base::Bind(&CastContentBrowserClient::CreateCdmFactory, | 84 base::Bind(&CastContentBrowserClient::CreateCdmFactory, |
85 base::Unretained(browser_client)), | 85 base::Unretained(browser_client)), |
86 browser_client->GetVideoResolutionPolicy())); | 86 browser_client->GetVideoResolutionPolicy(), |
| 87 browser_client->media_resource_tracker())); |
87 return std::unique_ptr<::shell::Service>( | 88 return std::unique_ptr<::shell::Service>( |
88 new ::media::MojoMediaApplication(std::move(mojo_media_client), | 89 new ::media::MojoMediaApplication(std::move(mojo_media_client), |
89 quit_closure)); | 90 quit_closure)); |
90 } | 91 } |
91 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 92 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
92 | 93 |
93 } // namespace | 94 } // namespace |
94 | 95 |
95 CastContentBrowserClient::CastContentBrowserClient() | 96 CastContentBrowserClient::CastContentBrowserClient() |
96 : cast_browser_main_parts_(nullptr), | 97 : cast_browser_main_parts_(nullptr), |
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 process_type, dumps_path, false /* upload */); | 541 process_type, dumps_path, false /* upload */); |
541 // StartUploaderThread() even though upload is diferred. | 542 // StartUploaderThread() even though upload is diferred. |
542 // Breakpad-related memory is freed in the uploader thread. | 543 // Breakpad-related memory is freed in the uploader thread. |
543 crash_handler->StartUploaderThread(); | 544 crash_handler->StartUploaderThread(); |
544 return crash_handler; | 545 return crash_handler; |
545 } | 546 } |
546 #endif // !defined(OS_ANDROID) | 547 #endif // !defined(OS_ANDROID) |
547 | 548 |
548 } // namespace shell | 549 } // namespace shell |
549 } // namespace chromecast | 550 } // namespace chromecast |
OLD | NEW |