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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 } | 123 } |
124 } | 124 } |
125 | 125 |
126 void CastContentBrowserClient::PreCreateThreads() { | 126 void CastContentBrowserClient::PreCreateThreads() { |
127 } | 127 } |
128 | 128 |
129 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( | 129 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( |
130 content::BrowserContext* browser_context, | 130 content::BrowserContext* browser_context, |
131 PrefService* pref_service, | 131 PrefService* pref_service, |
132 net::URLRequestContextGetter* request_context_getter, | 132 net::URLRequestContextGetter* request_context_getter, |
133 media::VideoPlaneController* video_plane_controller) { | 133 media::VideoPlaneController* video_plane_controller, |
134 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service); | 134 CastWindowManager* window_manager) { |
| 135 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service, |
| 136 window_manager); |
135 } | 137 } |
136 | 138 |
137 #if !defined(OS_ANDROID) | 139 #if !defined(OS_ANDROID) |
138 media::VideoResolutionPolicy* | 140 media::VideoResolutionPolicy* |
139 CastContentBrowserClient::GetVideoResolutionPolicy() { | 141 CastContentBrowserClient::GetVideoResolutionPolicy() { |
140 return nullptr; | 142 return nullptr; |
141 } | 143 } |
142 | 144 |
143 scoped_refptr<base::SingleThreadTaskRunner> | 145 scoped_refptr<base::SingleThreadTaskRunner> |
144 CastContentBrowserClient::GetMediaTaskRunner() { | 146 CastContentBrowserClient::GetMediaTaskRunner() { |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
523 process_type, dumps_path, false /* upload */); | 525 process_type, dumps_path, false /* upload */); |
524 // StartUploaderThread() even though upload is diferred. | 526 // StartUploaderThread() even though upload is diferred. |
525 // Breakpad-related memory is freed in the uploader thread. | 527 // Breakpad-related memory is freed in the uploader thread. |
526 crash_handler->StartUploaderThread(); | 528 crash_handler->StartUploaderThread(); |
527 return crash_handler; | 529 return crash_handler; |
528 } | 530 } |
529 #endif // !defined(OS_ANDROID) | 531 #endif // !defined(OS_ANDROID) |
530 | 532 |
531 } // namespace shell | 533 } // namespace shell |
532 } // namespace chromecast | 534 } // namespace chromecast |
OLD | NEW |