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 "base/logging.h" | 9 #include "base/logging.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
11 #include "content/public/browser/client_certificate_delegate.h" | 11 #include "content/public/browser/client_certificate_delegate.h" |
12 #include "content/public/browser/memory_coordinator_delegate.h" | 12 #include "content/public/browser/memory_coordinator_delegate.h" |
13 #include "content/public/browser/navigation_ui_data.h" | 13 #include "content/public/browser/navigation_ui_data.h" |
14 #include "content/public/browser/vpn_service_proxy.h" | 14 #include "content/public/browser/vpn_service_proxy.h" |
15 #include "content/public/common/sandbox_type.h" | 15 #include "content/public/common/sandbox_type.h" |
| 16 #include "media/audio/audio_manager.h" |
16 #include "media/base/cdm_factory.h" | 17 #include "media/base/cdm_factory.h" |
17 #include "media/media_features.h" | 18 #include "media/media_features.h" |
18 #include "storage/browser/quota/quota_manager.h" | 19 #include "storage/browser/quota/quota_manager.h" |
19 #include "ui/gfx/image/image_skia.h" | 20 #include "ui/gfx/image/image_skia.h" |
20 #include "url/gurl.h" | 21 #include "url/gurl.h" |
21 | 22 |
22 namespace content { | 23 namespace content { |
23 | 24 |
24 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 25 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
25 const MainFunctionParams& parameters) { | 26 const MainFunctionParams& parameters) { |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 return false; | 108 return false; |
108 } | 109 } |
109 | 110 |
110 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( | 111 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( |
111 SiteInstance* site_instance, | 112 SiteInstance* site_instance, |
112 const GURL& current_url, | 113 const GURL& current_url, |
113 const GURL& new_url) { | 114 const GURL& new_url) { |
114 return false; | 115 return false; |
115 } | 116 } |
116 | 117 |
117 media::ScopedAudioManagerPtr ContentBrowserClient::CreateAudioManager( | 118 std::unique_ptr<media::AudioManager> ContentBrowserClient::CreateAudioManager( |
| 119 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 120 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
118 media::AudioLogFactory* audio_log_factory) { | 121 media::AudioLogFactory* audio_log_factory) { |
119 return nullptr; | 122 return nullptr; |
120 } | 123 } |
121 | 124 |
122 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { | 125 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { |
123 return nullptr; | 126 return nullptr; |
124 } | 127 } |
125 | 128 |
126 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( | 129 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( |
127 BrowserContext* browser_context, | 130 BrowserContext* browser_context, |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 | 451 |
449 bool ContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { | 452 bool ContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { |
450 return false; | 453 return false; |
451 } | 454 } |
452 | 455 |
453 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 456 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
454 return false; | 457 return false; |
455 } | 458 } |
456 | 459 |
457 } // namespace content | 460 } // namespace content |
OLD | NEW |