Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1921)

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 2517953003: Move enable_webrtc to a buildflag header. (Closed)
Patch Set: Fix Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/public/browser/gpu_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/memory_coordinator_delegate.h" 11 #include "content/public/browser/memory_coordinator_delegate.h"
12 #include "content/public/browser/navigation_ui_data.h" 12 #include "content/public/browser/navigation_ui_data.h"
13 #include "content/public/browser/vpn_service_proxy.h" 13 #include "content/public/browser/vpn_service_proxy.h"
14 #include "content/public/common/sandbox_type.h" 14 #include "content/public/common/sandbox_type.h"
15 #include "media/base/cdm_factory.h" 15 #include "media/base/cdm_factory.h"
16 #include "media/media_features.h"
16 #include "storage/browser/quota/quota_manager.h" 17 #include "storage/browser/quota/quota_manager.h"
17 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace content { 21 namespace content {
21 22
22 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( 23 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
23 const MainFunctionParams& parameters) { 24 const MainFunctionParams& parameters) {
24 return nullptr; 25 return nullptr;
25 } 26 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } 196 }
196 197
197 bool ContentBrowserClient::AllowWorkerIndexedDB( 198 bool ContentBrowserClient::AllowWorkerIndexedDB(
198 const GURL& url, 199 const GURL& url,
199 const base::string16& name, 200 const base::string16& name,
200 ResourceContext* context, 201 ResourceContext* context,
201 const std::vector<std::pair<int, int> >& render_frames) { 202 const std::vector<std::pair<int, int> >& render_frames) {
202 return true; 203 return true;
203 } 204 }
204 205
205 #if defined(ENABLE_WEBRTC) 206 #if BUILDFLAG(ENABLE_WEBRTC)
206 bool ContentBrowserClient::AllowWebRTCIdentityCache(const GURL& url, 207 bool ContentBrowserClient::AllowWebRTCIdentityCache(const GURL& url,
207 const GURL& first_party_url, 208 const GURL& first_party_url,
208 ResourceContext* context) { 209 ResourceContext* context) {
209 return true; 210 return true;
210 } 211 }
211 #endif // defined(ENABLE_WEBRTC) 212 #endif // BUILDFLAG(ENABLE_WEBRTC)
212 213
213 bool ContentBrowserClient::AllowKeygen(const GURL& url, 214 bool ContentBrowserClient::AllowKeygen(const GURL& url,
214 content::ResourceContext* context) { 215 content::ResourceContext* context) {
215 return true; 216 return true;
216 } 217 }
217 218
218 ContentBrowserClient::AllowWebBluetoothResult 219 ContentBrowserClient::AllowWebBluetoothResult
219 ContentBrowserClient::AllowWebBluetooth( 220 ContentBrowserClient::AllowWebBluetooth(
220 content::BrowserContext* browser_context, 221 content::BrowserContext* browser_context,
221 const url::Origin& requesting_origin, 222 const url::Origin& requesting_origin,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 const std::string& name) { 428 const std::string& name) {
428 return nullptr; 429 return nullptr;
429 } 430 }
430 431
431 std::unique_ptr<MemoryCoordinatorDelegate> 432 std::unique_ptr<MemoryCoordinatorDelegate>
432 ContentBrowserClient::GetMemoryCoordinatorDelegate() { 433 ContentBrowserClient::GetMemoryCoordinatorDelegate() {
433 return std::unique_ptr<MemoryCoordinatorDelegate>(); 434 return std::unique_ptr<MemoryCoordinatorDelegate>();
434 } 435 }
435 436
436 } // namespace content 437 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/public/browser/gpu_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698