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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Minor change based on the comment Created 4 years, 5 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 "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
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 const std::string& audio_device_id) {
158 return media_pipeline_backend_manager()->CreateMediaPipelineBackend(params); 159 return media_pipeline_backend_manager()->CreateMediaPipelineBackend(params);
159 } 160 }
160 161
161 media::MediaResourceTracker* 162 media::MediaResourceTracker*
162 CastContentBrowserClient::media_resource_tracker() { 163 CastContentBrowserClient::media_resource_tracker() {
163 return cast_browser_main_parts_->media_resource_tracker(); 164 return cast_browser_main_parts_->media_resource_tracker();
164 } 165 }
165 166
166 media::MediaPipelineBackendManager* 167 media::MediaPipelineBackendManager*
167 CastContentBrowserClient::media_pipeline_backend_manager() { 168 CastContentBrowserClient::media_pipeline_backend_manager() {
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 process_type, dumps_path, false /* upload */); 553 process_type, dumps_path, false /* upload */);
553 // StartUploaderThread() even though upload is diferred. 554 // StartUploaderThread() even though upload is diferred.
554 // Breakpad-related memory is freed in the uploader thread. 555 // Breakpad-related memory is freed in the uploader thread.
555 crash_handler->StartUploaderThread(); 556 crash_handler->StartUploaderThread();
556 return crash_handler; 557 return crash_handler;
557 } 558 }
558 #endif // !defined(OS_ANDROID) 559 #endif // !defined(OS_ANDROID)
559 560
560 } // namespace shell 561 } // namespace shell
561 } // namespace chromecast 562 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/cast_content_browser_client.h ('k') | chromecast/browser/media/cast_mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698