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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 namespace { | 75 namespace { |
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 return std::unique_ptr<::shell::Service>( | 87 return std::unique_ptr<::shell::Service>( |
87 new ::media::MojoMediaApplication(std::move(mojo_media_client), | 88 new ::media::MojoMediaApplication(std::move(mojo_media_client), |
88 quit_closure)); | 89 quit_closure)); |
89 } | 90 } |
90 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 91 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
91 | 92 |
92 } // namespace | 93 } // namespace |
93 | 94 |
94 CastContentBrowserClient::CastContentBrowserClient() | 95 CastContentBrowserClient::CastContentBrowserClient() |
95 : cast_browser_main_parts_(nullptr), | 96 : cast_browser_main_parts_(nullptr), |
(...skipping 29 matching lines...) Expand all Loading... |
125 | 126 |
126 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( | 127 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( |
127 content::BrowserContext* browser_context, | 128 content::BrowserContext* browser_context, |
128 PrefService* pref_service, | 129 PrefService* pref_service, |
129 net::URLRequestContextGetter* request_context_getter, | 130 net::URLRequestContextGetter* request_context_getter, |
130 media::VideoPlaneController* video_plane_controller) { | 131 media::VideoPlaneController* video_plane_controller) { |
131 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service); | 132 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service); |
132 } | 133 } |
133 | 134 |
134 #if !defined(OS_ANDROID) | 135 #if !defined(OS_ANDROID) |
| 136 media::VideoResolutionPolicy* |
| 137 CastContentBrowserClient::GetVideoResolutionPolicy() { |
| 138 return nullptr; |
| 139 } |
| 140 |
135 scoped_refptr<base::SingleThreadTaskRunner> | 141 scoped_refptr<base::SingleThreadTaskRunner> |
136 CastContentBrowserClient::GetMediaTaskRunner() { | 142 CastContentBrowserClient::GetMediaTaskRunner() { |
137 DCHECK(cast_browser_main_parts_); | 143 DCHECK(cast_browser_main_parts_); |
138 return cast_browser_main_parts_->GetMediaTaskRunner(); | 144 return cast_browser_main_parts_->GetMediaTaskRunner(); |
139 } | 145 } |
140 | 146 |
141 std::unique_ptr<media::MediaPipelineBackend> | 147 std::unique_ptr<media::MediaPipelineBackend> |
142 CastContentBrowserClient::CreateMediaPipelineBackend( | 148 CastContentBrowserClient::CreateMediaPipelineBackend( |
143 const media::MediaPipelineDeviceParams& params, | 149 const media::MediaPipelineDeviceParams& params, |
144 const std::string& audio_device_id) { | 150 const std::string& audio_device_id) { |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 process_type, dumps_path, false /* upload */); | 546 process_type, dumps_path, false /* upload */); |
541 // StartUploaderThread() even though upload is diferred. | 547 // StartUploaderThread() even though upload is diferred. |
542 // Breakpad-related memory is freed in the uploader thread. | 548 // Breakpad-related memory is freed in the uploader thread. |
543 crash_handler->StartUploaderThread(); | 549 crash_handler->StartUploaderThread(); |
544 return crash_handler; | 550 return crash_handler; |
545 } | 551 } |
546 #endif // !defined(OS_ANDROID) | 552 #endif // !defined(OS_ANDROID) |
547 | 553 |
548 } // namespace shell | 554 } // namespace shell |
549 } // namespace chromecast | 555 } // namespace chromecast |
OLD | NEW |