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 | |
9 #include <string> | 8 #include <string> |
| 9 #include <utility> |
10 | 10 |
11 #include "base/base_switches.h" | 11 #include "base/base_switches.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/files/scoped_file.h" | 13 #include "base/files/scoped_file.h" |
14 #include "base/i18n/rtl.h" | 14 #include "base/i18n/rtl.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "chromecast/base/cast_paths.h" | 19 #include "chromecast/base/cast_paths.h" |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 new network_hints::NetworkHintsMessageFilter( | 156 new network_hints::NetworkHintsMessageFilter( |
157 url_request_context_factory_->host_resolver())); | 157 url_request_context_factory_->host_resolver())); |
158 host->AddFilter(network_hints_message_filter.get()); | 158 host->AddFilter(network_hints_message_filter.get()); |
159 } | 159 } |
160 | 160 |
161 net::URLRequestContextGetter* CastContentBrowserClient::CreateRequestContext( | 161 net::URLRequestContextGetter* CastContentBrowserClient::CreateRequestContext( |
162 content::BrowserContext* browser_context, | 162 content::BrowserContext* browser_context, |
163 content::ProtocolHandlerMap* protocol_handlers, | 163 content::ProtocolHandlerMap* protocol_handlers, |
164 content::URLRequestInterceptorScopedVector request_interceptors) { | 164 content::URLRequestInterceptorScopedVector request_interceptors) { |
165 return url_request_context_factory_->CreateMainGetter( | 165 return url_request_context_factory_->CreateMainGetter( |
166 browser_context, | 166 browser_context, protocol_handlers, std::move(request_interceptors)); |
167 protocol_handlers, | |
168 request_interceptors.Pass()); | |
169 } | 167 } |
170 | 168 |
171 bool CastContentBrowserClient::IsHandledURL(const GURL& url) { | 169 bool CastContentBrowserClient::IsHandledURL(const GURL& url) { |
172 if (!url.is_valid()) | 170 if (!url.is_valid()) |
173 return false; | 171 return false; |
174 | 172 |
175 static const char* const kProtocolList[] = { | 173 static const char* const kProtocolList[] = { |
176 url::kBlobScheme, | 174 url::kBlobScheme, |
177 url::kFileSystemScheme, | 175 url::kFileSystemScheme, |
178 content::kChromeUIScheme, | 176 content::kChromeUIScheme, |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 process_type, dumps_path, false /* upload */); | 453 process_type, dumps_path, false /* upload */); |
456 // StartUploaderThread() even though upload is diferred. | 454 // StartUploaderThread() even though upload is diferred. |
457 // Breakpad-related memory is freed in the uploader thread. | 455 // Breakpad-related memory is freed in the uploader thread. |
458 crash_handler->StartUploaderThread(); | 456 crash_handler->StartUploaderThread(); |
459 return crash_handler; | 457 return crash_handler; |
460 } | 458 } |
461 #endif // !defined(OS_ANDROID) | 459 #endif // !defined(OS_ANDROID) |
462 | 460 |
463 } // namespace shell | 461 } // namespace shell |
464 } // namespace chromecast | 462 } // namespace chromecast |
OLD | NEW |