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

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

Issue 1855633002: Revert of [chromecast] Pass media task runner to MediaPipelineBackendManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 8 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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 PrefService* pref_service, 102 PrefService* pref_service,
103 net::URLRequestContextGetter* request_context_getter, 103 net::URLRequestContextGetter* request_context_getter,
104 media::VideoPlaneController* video_plane_controller) { 104 media::VideoPlaneController* video_plane_controller) {
105 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service)); 105 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service));
106 } 106 }
107 107
108 #if !defined(OS_ANDROID) 108 #if !defined(OS_ANDROID)
109 scoped_ptr<media::MediaPipelineBackend> 109 scoped_ptr<media::MediaPipelineBackend>
110 CastContentBrowserClient::CreateMediaPipelineBackend( 110 CastContentBrowserClient::CreateMediaPipelineBackend(
111 const media::MediaPipelineDeviceParams& params) { 111 const media::MediaPipelineDeviceParams& params) {
112 DCHECK(cast_browser_main_parts_); 112 return make_scoped_ptr(
113 return media_pipeline_backend_manager()->CreateMediaPipelineBackend(params); 113 media::MediaPipelineBackendManager::CreateMediaPipelineBackend(params));
114 } 114 }
115 115
116 media::MediaResourceTracker* 116 media::MediaResourceTracker*
117 CastContentBrowserClient::media_resource_tracker() { 117 CastContentBrowserClient::media_resource_tracker() {
118 return cast_browser_main_parts_->media_resource_tracker(); 118 return cast_browser_main_parts_->media_resource_tracker();
119 } 119 }
120 120 #endif // OS_ANDROID
121 media::MediaPipelineBackendManager*
122 CastContentBrowserClient::media_pipeline_backend_manager() {
123 return cast_browser_main_parts_->media_pipeline_backend_manager();
124 }
125 #endif // !defined(OS_ANDROID)
126 121
127 void CastContentBrowserClient::SetMetricsClientId( 122 void CastContentBrowserClient::SetMetricsClientId(
128 const std::string& client_id) { 123 const std::string& client_id) {
129 } 124 }
130 125
131 void CastContentBrowserClient::RegisterMetricsProviders( 126 void CastContentBrowserClient::RegisterMetricsProviders(
132 ::metrics::MetricsService* metrics_service) { 127 ::metrics::MetricsService* metrics_service) {
133 } 128 }
134 129
135 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() { 130 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() {
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 process_type, dumps_path, false /* upload */); 491 process_type, dumps_path, false /* upload */);
497 // StartUploaderThread() even though upload is diferred. 492 // StartUploaderThread() even though upload is diferred.
498 // Breakpad-related memory is freed in the uploader thread. 493 // Breakpad-related memory is freed in the uploader thread.
499 crash_handler->StartUploaderThread(); 494 crash_handler->StartUploaderThread();
500 return crash_handler; 495 return crash_handler;
501 } 496 }
502 #endif // !defined(OS_ANDROID) 497 #endif // !defined(OS_ANDROID)
503 498
504 } // namespace shell 499 } // namespace shell
505 } // namespace chromecast 500 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/cast_content_browser_client.h ('k') | chromecast/media/audio/cast_audio_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698