Chromium Code Reviews| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 | 147 |
| 148 #if !defined(OS_ANDROID) | 148 #if !defined(OS_ANDROID) |
| 149 scoped_refptr<base::SingleThreadTaskRunner> | 149 scoped_refptr<base::SingleThreadTaskRunner> |
| 150 CastContentBrowserClient::GetMediaTaskRunner() { | 150 CastContentBrowserClient::GetMediaTaskRunner() { |
| 151 DCHECK(cast_browser_main_parts_); | 151 DCHECK(cast_browser_main_parts_); |
| 152 return cast_browser_main_parts_->GetMediaTaskRunner(); | 152 return cast_browser_main_parts_->GetMediaTaskRunner(); |
| 153 } | 153 } |
| 154 | 154 |
| 155 std::unique_ptr<media::MediaPipelineBackend> | 155 std::unique_ptr<media::MediaPipelineBackend> |
| 156 CastContentBrowserClient::CreateMediaPipelineBackend( | 156 CastContentBrowserClient::CreateMediaPipelineBackend( |
| 157 const media::MediaPipelineDeviceParams& params) { | 157 const media::MediaPipelineDeviceParams& params, |
| 158 return media_pipeline_backend_manager()->CreateMediaPipelineBackend(params); | 158 const std::string& audio_device_id) { |
| 159 return media_pipeline_backend_manager()->CreateMediaPipelineBackend( | |
| 160 params, 0); | |
|
kmackay
2016/07/12 18:35:52
nit: I'd prefer to leave this as before (ie, don't
tianyuwang1
2016/07/12 19:38:35
Done.
| |
| 159 } | 161 } |
| 160 | 162 |
| 161 media::MediaResourceTracker* | 163 media::MediaResourceTracker* |
| 162 CastContentBrowserClient::media_resource_tracker() { | 164 CastContentBrowserClient::media_resource_tracker() { |
| 163 return cast_browser_main_parts_->media_resource_tracker(); | 165 return cast_browser_main_parts_->media_resource_tracker(); |
| 164 } | 166 } |
| 165 | 167 |
| 166 media::MediaPipelineBackendManager* | 168 media::MediaPipelineBackendManager* |
| 167 CastContentBrowserClient::media_pipeline_backend_manager() { | 169 CastContentBrowserClient::media_pipeline_backend_manager() { |
| 168 DCHECK(cast_browser_main_parts_); | 170 DCHECK(cast_browser_main_parts_); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 552 process_type, dumps_path, false /* upload */); | 554 process_type, dumps_path, false /* upload */); |
| 553 // StartUploaderThread() even though upload is diferred. | 555 // StartUploaderThread() even though upload is diferred. |
| 554 // Breakpad-related memory is freed in the uploader thread. | 556 // Breakpad-related memory is freed in the uploader thread. |
| 555 crash_handler->StartUploaderThread(); | 557 crash_handler->StartUploaderThread(); |
| 556 return crash_handler; | 558 return crash_handler; |
| 557 } | 559 } |
| 558 #endif // !defined(OS_ANDROID) | 560 #endif // !defined(OS_ANDROID) |
| 559 | 561 |
| 560 } // namespace shell | 562 } // namespace shell |
| 561 } // namespace chromecast | 563 } // namespace chromecast |
| OLD | NEW |