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/navigation_ui_data.h" |
11 #include "content/public/browser/vpn_service_proxy.h" | 12 #include "content/public/browser/vpn_service_proxy.h" |
12 #include "content/public/common/sandbox_type.h" | 13 #include "content/public/common/sandbox_type.h" |
13 #include "media/base/cdm_factory.h" | 14 #include "media/base/cdm_factory.h" |
14 #include "storage/browser/quota/quota_manager.h" | 15 #include "storage/browser/quota/quota_manager.h" |
15 #include "ui/gfx/image/image_skia.h" | 16 #include "ui/gfx/image/image_skia.h" |
16 #include "url/gurl.h" | 17 #include "url/gurl.h" |
17 | 18 |
18 namespace content { | 19 namespace content { |
19 | 20 |
20 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 21 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 const base::Callback<void(content::WebContents*)>& callback) { | 386 const base::Callback<void(content::WebContents*)>& callback) { |
386 callback.Run(nullptr); | 387 callback.Run(nullptr); |
387 } | 388 } |
388 | 389 |
389 ScopedVector<NavigationThrottle> | 390 ScopedVector<NavigationThrottle> |
390 ContentBrowserClient::CreateThrottlesForNavigation( | 391 ContentBrowserClient::CreateThrottlesForNavigation( |
391 NavigationHandle* navigation_handle) { | 392 NavigationHandle* navigation_handle) { |
392 return ScopedVector<NavigationThrottle>(); | 393 return ScopedVector<NavigationThrottle>(); |
393 } | 394 } |
394 | 395 |
| 396 std::unique_ptr<NavigationUIData> ContentBrowserClient::GetNavigationUIData( |
| 397 NavigationHandle* navigation_handle) { |
| 398 return nullptr; |
| 399 } |
| 400 |
395 #if defined(OS_WIN) | 401 #if defined(OS_WIN) |
396 const wchar_t* ContentBrowserClient::GetResourceDllName() { | 402 const wchar_t* ContentBrowserClient::GetResourceDllName() { |
397 return nullptr; | 403 return nullptr; |
398 } | 404 } |
399 | 405 |
400 bool ContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy) { | 406 bool ContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy) { |
401 return true; | 407 return true; |
402 } | 408 } |
403 | 409 |
404 base::string16 ContentBrowserClient::GetAppContainerSidForSandboxType( | 410 base::string16 ContentBrowserClient::GetAppContainerSidForSandboxType( |
(...skipping 17 matching lines...) Expand all Loading... |
422 #if defined(VIDEO_HOLE) | 428 #if defined(VIDEO_HOLE) |
423 ExternalVideoSurfaceContainer* | 429 ExternalVideoSurfaceContainer* |
424 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 430 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
425 WebContents* web_contents) { | 431 WebContents* web_contents) { |
426 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; | 432 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; |
427 return nullptr; | 433 return nullptr; |
428 } | 434 } |
429 #endif | 435 #endif |
430 | 436 |
431 } // namespace content | 437 } // namespace content |
OLD | NEW |