Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_runner. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "content/public/browser/client_certificate_delegate.h" 8 #include "content/public/browser/client_certificate_delegate.h"
9 #include "content/public/common/sandbox_type.h" 9 #include "content/public/common/sandbox_type.h"
10 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 } 204 }
205 205
206 #if defined(ENABLE_WEBRTC) 206 #if defined(ENABLE_WEBRTC)
207 bool ContentBrowserClient::AllowWebRTCIdentityCache(const GURL& url, 207 bool ContentBrowserClient::AllowWebRTCIdentityCache(const GURL& url,
208 const GURL& first_party_url, 208 const GURL& first_party_url,
209 ResourceContext* context) { 209 ResourceContext* context) {
210 return true; 210 return true;
211 } 211 }
212 #endif // defined(ENABLE_WEBRTC) 212 #endif // defined(ENABLE_WEBRTC)
213 213
214 bool ContentBrowserClient::AllowKeygen(const GURL& url,
215 content::ResourceContext* context) {
216 return true;
217 }
218
214 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { 219 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
215 return nullptr; 220 return nullptr;
216 } 221 }
217 222
218 void ContentBrowserClient::SelectClientCertificate( 223 void ContentBrowserClient::SelectClientCertificate(
219 WebContents* web_contents, 224 WebContents* web_contents,
220 net::SSLCertRequestInfo* cert_request_info, 225 net::SSLCertRequestInfo* cert_request_info,
221 scoped_ptr<ClientCertificateDelegate> delegate) { 226 scoped_ptr<ClientCertificateDelegate> delegate) {
222 } 227 }
223 228
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 #if defined(VIDEO_HOLE) 399 #if defined(VIDEO_HOLE)
395 ExternalVideoSurfaceContainer* 400 ExternalVideoSurfaceContainer*
396 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 401 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
397 WebContents* web_contents) { 402 WebContents* web_contents) {
398 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; 403 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348.";
399 return nullptr; 404 return nullptr;
400 } 405 }
401 #endif 406 #endif
402 407
403 } // namespace content 408 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698