| 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 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 base::CommandLine* command_line) { | 94 base::CommandLine* command_line) { |
| 95 } | 95 } |
| 96 | 96 |
| 97 void CastContentBrowserClient::PreCreateThreads() { | 97 void CastContentBrowserClient::PreCreateThreads() { |
| 98 } | 98 } |
| 99 | 99 |
| 100 scoped_ptr<CastService> CastContentBrowserClient::CreateCastService( | 100 scoped_ptr<CastService> CastContentBrowserClient::CreateCastService( |
| 101 content::BrowserContext* browser_context, | 101 content::BrowserContext* browser_context, |
| 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 media::MediaPipelineBackendManager* media_pipeline_backend_manager) { |
| 105 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service)); | 106 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service)); |
| 106 } | 107 } |
| 107 | 108 |
| 108 #if !defined(OS_ANDROID) | 109 #if !defined(OS_ANDROID) |
| 109 scoped_ptr<media::MediaPipelineBackend> | 110 scoped_ptr<media::MediaPipelineBackend> |
| 110 CastContentBrowserClient::CreateMediaPipelineBackend( | 111 CastContentBrowserClient::CreateMediaPipelineBackend( |
| 111 const media::MediaPipelineDeviceParams& params) { | 112 const media::MediaPipelineDeviceParams& params) { |
| 113 DCHECK(cast_browser_main_parts_); |
| 112 return make_scoped_ptr( | 114 return make_scoped_ptr( |
| 113 media::MediaPipelineBackendManager::CreateMediaPipelineBackend(params)); | 115 cast_browser_main_parts_->media_pipeline_backend_manager() |
| 116 ->CreateMediaPipelineBackend(params)); |
| 114 } | 117 } |
| 115 | 118 |
| 116 media::MediaResourceTracker* | 119 media::MediaResourceTracker* |
| 117 CastContentBrowserClient::media_resource_tracker() { | 120 CastContentBrowserClient::media_resource_tracker() { |
| 118 return cast_browser_main_parts_->media_resource_tracker(); | 121 return cast_browser_main_parts_->media_resource_tracker(); |
| 119 } | 122 } |
| 120 #endif // OS_ANDROID | 123 #endif // OS_ANDROID |
| 121 | 124 |
| 122 void CastContentBrowserClient::SetMetricsClientId( | 125 void CastContentBrowserClient::SetMetricsClientId( |
| 123 const std::string& client_id) { | 126 const std::string& client_id) { |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 process_type, dumps_path, false /* upload */); | 494 process_type, dumps_path, false /* upload */); |
| 492 // StartUploaderThread() even though upload is diferred. | 495 // StartUploaderThread() even though upload is diferred. |
| 493 // Breakpad-related memory is freed in the uploader thread. | 496 // Breakpad-related memory is freed in the uploader thread. |
| 494 crash_handler->StartUploaderThread(); | 497 crash_handler->StartUploaderThread(); |
| 495 return crash_handler; | 498 return crash_handler; |
| 496 } | 499 } |
| 497 #endif // !defined(OS_ANDROID) | 500 #endif // !defined(OS_ANDROID) |
| 498 | 501 |
| 499 } // namespace shell | 502 } // namespace shell |
| 500 } // namespace chromecast | 503 } // namespace chromecast |
| OLD | NEW |