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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 } | 124 } |
125 } | 125 } |
126 | 126 |
127 void CastContentBrowserClient::PreCreateThreads() { | 127 void CastContentBrowserClient::PreCreateThreads() { |
128 } | 128 } |
129 | 129 |
130 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( | 130 std::unique_ptr<CastService> CastContentBrowserClient::CreateCastService( |
131 content::BrowserContext* browser_context, | 131 content::BrowserContext* browser_context, |
132 PrefService* pref_service, | 132 PrefService* pref_service, |
133 net::URLRequestContextGetter* request_context_getter, | 133 net::URLRequestContextGetter* request_context_getter, |
134 media::VideoPlaneController* video_plane_controller) { | 134 media::VideoPlaneController* video_plane_controller, |
135 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service); | 135 CastWindowManager* cast_window_manager) { |
| 136 return base::MakeUnique<CastServiceSimple>(browser_context, pref_service, |
| 137 cast_window_manager); |
136 } | 138 } |
137 | 139 |
138 #if !defined(OS_ANDROID) | 140 #if !defined(OS_ANDROID) |
139 media::VideoResolutionPolicy* | 141 media::VideoResolutionPolicy* |
140 CastContentBrowserClient::GetVideoResolutionPolicy() { | 142 CastContentBrowserClient::GetVideoResolutionPolicy() { |
141 return nullptr; | 143 return nullptr; |
142 } | 144 } |
143 | 145 |
144 scoped_refptr<base::SingleThreadTaskRunner> | 146 scoped_refptr<base::SingleThreadTaskRunner> |
145 CastContentBrowserClient::GetMediaTaskRunner() { | 147 CastContentBrowserClient::GetMediaTaskRunner() { |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 process_type, dumps_path, false /* upload */); | 549 process_type, dumps_path, false /* upload */); |
548 // StartUploaderThread() even though upload is diferred. | 550 // StartUploaderThread() even though upload is diferred. |
549 // Breakpad-related memory is freed in the uploader thread. | 551 // Breakpad-related memory is freed in the uploader thread. |
550 crash_handler->StartUploaderThread(); | 552 crash_handler->StartUploaderThread(); |
551 return crash_handler; | 553 return crash_handler; |
552 } | 554 } |
553 #endif // !defined(OS_ANDROID) | 555 #endif // !defined(OS_ANDROID) |
554 | 556 |
555 } // namespace shell | 557 } // namespace shell |
556 } // namespace chromecast | 558 } // namespace chromecast |
OLD | NEW |