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/shell/browser/cast_content_browser_client.h" | 5 #include "chromecast/shell/browser/cast_content_browser_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "chromecast/common/cast_paths.h" | 10 #include "chromecast/common/cast_paths.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 return locale.empty() ? "en-US" : locale; | 112 return locale.empty() ? "en-US" : locale; |
113 } | 113 } |
114 | 114 |
115 void CastContentBrowserClient::AllowCertificateError( | 115 void CastContentBrowserClient::AllowCertificateError( |
116 int render_process_id, | 116 int render_process_id, |
117 int render_view_id, | 117 int render_view_id, |
118 int cert_error, | 118 int cert_error, |
119 const net::SSLInfo& ssl_info, | 119 const net::SSLInfo& ssl_info, |
120 const GURL& request_url, | 120 const GURL& request_url, |
121 content::ResourceType resource_type, | 121 content::ResourceType resource_type, |
122 bool overridable, | 122 int options_mask, |
123 bool strict_enforcement, | |
124 bool expired_previous_decision, | |
125 const base::Callback<void(bool)>& callback, | 123 const base::Callback<void(bool)>& callback, |
126 content::CertificateRequestResultType* result) { | 124 content::CertificateRequestResultType* result) { |
127 // Allow developers to override certificate errors. | 125 // Allow developers to override certificate errors. |
128 // Otherwise, any fatal certificate errors will cause an abort. | 126 // Otherwise, any fatal certificate errors will cause an abort. |
129 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL; | 127 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL; |
130 return; | 128 return; |
131 } | 129 } |
132 | 130 |
133 bool CastContentBrowserClient::CanCreateWindow( | 131 bool CastContentBrowserClient::CanCreateWindow( |
134 const GURL& opener_url, | 132 const GURL& opener_url, |
(...skipping 28 matching lines...) Expand all Loading... |
163 << "cast_shell.pak"; | 161 << "cast_shell.pak"; |
164 } | 162 } |
165 mappings->push_back(content::FileDescriptorInfo( | 163 mappings->push_back(content::FileDescriptorInfo( |
166 kAndroidPakDescriptor, | 164 kAndroidPakDescriptor, |
167 base::FileDescriptor(base::File(pak_file, flags)))); | 165 base::FileDescriptor(base::File(pak_file, flags)))); |
168 #endif // defined(OS_ANDROID) | 166 #endif // defined(OS_ANDROID) |
169 } | 167 } |
170 | 168 |
171 } // namespace shell | 169 } // namespace shell |
172 } // namespace chromecast | 170 } // namespace chromecast |
OLD | NEW |