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

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

Issue 1841763002: Add a kill switch for all of Web Bluetooth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Sync and rename an enum value. Created 4 years, 8 months 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
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 "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/public/browser/client_certificate_delegate.h" 9 #include "content/public/browser/client_certificate_delegate.h"
10 #include "content/public/common/sandbox_type.h" 10 #include "content/public/common/sandbox_type.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 ResourceContext* context) { 210 ResourceContext* context) {
211 return true; 211 return true;
212 } 212 }
213 #endif // defined(ENABLE_WEBRTC) 213 #endif // defined(ENABLE_WEBRTC)
214 214
215 bool ContentBrowserClient::AllowKeygen(const GURL& url, 215 bool ContentBrowserClient::AllowKeygen(const GURL& url,
216 content::ResourceContext* context) { 216 content::ResourceContext* context) {
217 return true; 217 return true;
218 } 218 }
219 219
220 bool ContentBrowserClient::AllowWebBluetooth( 220 ContentBrowserClient::AllowWebBluetoothResult
221 ContentBrowserClient::AllowWebBluetooth(
221 content::BrowserContext* browser_context, 222 content::BrowserContext* browser_context,
222 const url::Origin& requesting_origin, 223 const url::Origin& requesting_origin,
223 const url::Origin& embedding_origin) { 224 const url::Origin& embedding_origin) {
224 return true; 225 return AllowWebBluetoothResult::ALLOW;
225 } 226 }
226 227
227 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { 228 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
228 return nullptr; 229 return nullptr;
229 } 230 }
230 231
231 scoped_ptr<storage::QuotaEvictionPolicy> 232 scoped_ptr<storage::QuotaEvictionPolicy>
232 ContentBrowserClient::GetTemporaryStorageEvictionPolicy( 233 ContentBrowserClient::GetTemporaryStorageEvictionPolicy(
233 content::BrowserContext* context) { 234 content::BrowserContext* context) {
234 return scoped_ptr<storage::QuotaEvictionPolicy>(); 235 return scoped_ptr<storage::QuotaEvictionPolicy>();
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 #if defined(VIDEO_HOLE) 429 #if defined(VIDEO_HOLE)
429 ExternalVideoSurfaceContainer* 430 ExternalVideoSurfaceContainer*
430 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 431 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
431 WebContents* web_contents) { 432 WebContents* web_contents) {
432 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; 433 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348.";
433 return nullptr; 434 return nullptr;
434 } 435 }
435 #endif 436 #endif
436 437
437 } // namespace content 438 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698