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 "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 "media/base/cdm_factory.h" |
10 #include "storage/browser/quota/quota_manager.h" | 11 #include "storage/browser/quota/quota_manager.h" |
11 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
12 #include "url/gurl.h" | 13 #include "url/gurl.h" |
13 | 14 |
14 namespace content { | 15 namespace content { |
15 | 16 |
16 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 17 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
17 const MainFunctionParams& parameters) { | 18 const MainFunctionParams& parameters) { |
18 return nullptr; | 19 return nullptr; |
19 } | 20 } |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 return false; | 107 return false; |
107 } | 108 } |
108 | 109 |
109 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( | 110 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( |
110 SiteInstance* site_instance, | 111 SiteInstance* site_instance, |
111 const GURL& current_url, | 112 const GURL& current_url, |
112 const GURL& new_url) { | 113 const GURL& new_url) { |
113 return false; | 114 return false; |
114 } | 115 } |
115 | 116 |
| 117 scoped_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { |
| 118 return nullptr; |
| 119 } |
| 120 |
116 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( | 121 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( |
117 ResourceContext* resource_context, const GURL& current_url, | 122 ResourceContext* resource_context, const GURL& current_url, |
118 const GURL& new_url) { | 123 const GURL& new_url) { |
119 return false; | 124 return false; |
120 } | 125 } |
121 | 126 |
122 bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) { | 127 bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) { |
123 return true; | 128 return true; |
124 } | 129 } |
125 | 130 |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 #if defined(VIDEO_HOLE) | 406 #if defined(VIDEO_HOLE) |
402 ExternalVideoSurfaceContainer* | 407 ExternalVideoSurfaceContainer* |
403 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 408 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
404 WebContents* web_contents) { | 409 WebContents* web_contents) { |
405 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; | 410 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; |
406 return nullptr; | 411 return nullptr; |
407 } | 412 } |
408 #endif | 413 #endif |
409 | 414 |
410 } // namespace content | 415 } // namespace content |
OLD | NEW |