OLD | NEW |
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 "base/guid.h" | 8 #include "base/guid.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "content/public/browser/client_certificate_delegate.h" | 10 #include "content/public/browser/client_certificate_delegate.h" |
| 11 #include "content/public/browser/vpn_service_proxy.h" |
11 #include "content/public/common/sandbox_type.h" | 12 #include "content/public/common/sandbox_type.h" |
12 #include "media/base/cdm_factory.h" | 13 #include "media/base/cdm_factory.h" |
13 #include "storage/browser/quota/quota_manager.h" | 14 #include "storage/browser/quota/quota_manager.h" |
14 #include "ui/gfx/image/image_skia.h" | 15 #include "ui/gfx/image/image_skia.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 20 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
20 const MainFunctionParams& parameters) { | 21 const MainFunctionParams& parameters) { |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 const SocketPermissionRequest* params) { | 339 const SocketPermissionRequest* params) { |
339 return false; | 340 return false; |
340 } | 341 } |
341 | 342 |
342 bool ContentBrowserClient::IsPepperVpnProviderAPIAllowed( | 343 bool ContentBrowserClient::IsPepperVpnProviderAPIAllowed( |
343 BrowserContext* browser_context, | 344 BrowserContext* browser_context, |
344 const GURL& url) { | 345 const GURL& url) { |
345 return false; | 346 return false; |
346 } | 347 } |
347 | 348 |
| 349 std::unique_ptr<VpnServiceProxy> ContentBrowserClient::GetVpnServiceProxy( |
| 350 BrowserContext* browser_context) { |
| 351 return nullptr; |
| 352 } |
| 353 |
348 ui::SelectFilePolicy* ContentBrowserClient::CreateSelectFilePolicy( | 354 ui::SelectFilePolicy* ContentBrowserClient::CreateSelectFilePolicy( |
349 WebContents* web_contents) { | 355 WebContents* web_contents) { |
350 return nullptr; | 356 return nullptr; |
351 } | 357 } |
352 | 358 |
353 LocationProvider* ContentBrowserClient::OverrideSystemLocationProvider() { | 359 LocationProvider* ContentBrowserClient::OverrideSystemLocationProvider() { |
354 return nullptr; | 360 return nullptr; |
355 } | 361 } |
356 | 362 |
357 DevToolsManagerDelegate* ContentBrowserClient::GetDevToolsManagerDelegate() { | 363 DevToolsManagerDelegate* ContentBrowserClient::GetDevToolsManagerDelegate() { |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 #if defined(VIDEO_HOLE) | 434 #if defined(VIDEO_HOLE) |
429 ExternalVideoSurfaceContainer* | 435 ExternalVideoSurfaceContainer* |
430 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 436 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
431 WebContents* web_contents) { | 437 WebContents* web_contents) { |
432 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; | 438 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; |
433 return nullptr; | 439 return nullptr; |
434 } | 440 } |
435 #endif | 441 #endif |
436 | 442 |
437 } // namespace content | 443 } // namespace content |
OLD | NEW |