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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/guid.h" | 10 #include "base/guid.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "content/public/browser/client_certificate_delegate.h" | 13 #include "content/public/browser/client_certificate_delegate.h" |
14 #include "content/public/browser/memory_coordinator_delegate.h" | 14 #include "content/public/browser/memory_coordinator_delegate.h" |
15 #include "content/public/browser/navigation_ui_data.h" | 15 #include "content/public/browser/navigation_ui_data.h" |
16 #include "content/public/browser/vpn_service_proxy.h" | 16 #include "content/public/browser/vpn_service_proxy.h" |
17 #include "content/public/common/sandbox_type.h" | 17 #include "content/public/common/sandbox_type.h" |
| 18 #include "media/audio/audio_manager.h" |
18 #include "media/base/cdm_factory.h" | 19 #include "media/base/cdm_factory.h" |
19 #include "media/media_features.h" | 20 #include "media/media_features.h" |
20 #include "net/cert/x509_certificate.h" | 21 #include "net/cert/x509_certificate.h" |
21 #include "storage/browser/quota/quota_manager.h" | 22 #include "storage/browser/quota/quota_manager.h" |
22 #include "ui/gfx/image/image_skia.h" | 23 #include "ui/gfx/image/image_skia.h" |
23 #include "url/gurl.h" | 24 #include "url/gurl.h" |
24 | 25 |
25 namespace content { | 26 namespace content { |
26 | 27 |
27 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 28 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 return false; | 111 return false; |
111 } | 112 } |
112 | 113 |
113 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( | 114 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( |
114 SiteInstance* site_instance, | 115 SiteInstance* site_instance, |
115 const GURL& current_url, | 116 const GURL& current_url, |
116 const GURL& new_url) { | 117 const GURL& new_url) { |
117 return false; | 118 return false; |
118 } | 119 } |
119 | 120 |
120 media::ScopedAudioManagerPtr ContentBrowserClient::CreateAudioManager( | 121 std::unique_ptr<media::AudioManager> ContentBrowserClient::CreateAudioManager( |
121 media::AudioLogFactory* audio_log_factory) { | 122 media::AudioLogFactory* audio_log_factory) { |
122 return nullptr; | 123 return nullptr; |
123 } | 124 } |
124 | 125 |
125 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { | 126 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { |
126 return nullptr; | 127 return nullptr; |
127 } | 128 } |
128 | 129 |
129 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( | 130 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( |
130 BrowserContext* browser_context, | 131 BrowserContext* browser_context, |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 | 469 |
469 bool ContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { | 470 bool ContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { |
470 return false; | 471 return false; |
471 } | 472 } |
472 | 473 |
473 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 474 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
474 return false; | 475 return false; |
475 } | 476 } |
476 | 477 |
477 } // namespace content | 478 } // namespace content |
OLD | NEW |